PHP: populating PHP_AUTH_* server variables.

This closes #498 issue on GitHub.

5 files changed, 19 insertions, 0 deletions

diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c
index 6aef264c..d3da6942 100644
--- a/src/nxt_h1proto.c
+++ b/src/nxt_h1proto.c
@@ -174,6 +174,8 @@ static nxt_http_field_proc_t           nxt_h1p_fields[] = {
     { nxt_string("Content-Type"),      &nxt_http_request_field,
         offsetof(nxt_http_request_t, content_type) },
     { nxt_string("Content-Length"),    &nxt_http_request_content_length, 0 },
+    { nxt_string("Authorization"),     &nxt_http_request_field,
+        offsetof(nxt_http_request_t, authorization) },
 };
 
 
diff --git a/src/nxt_http.h b/src/nxt_http.h
index 1418be95..e30bfeb4 100644
--- a/src/nxt_http.h
+++ b/src/nxt_http.h
@@ -156,6 +156,7 @@ struct nxt_http_request_s {
     nxt_http_field_t                *cookie;
     nxt_http_field_t                *referer;
     nxt_http_field_t                *user_agent;
+    nxt_http_field_t                *authorization;
     nxt_off_t                       content_length_n;
 
     nxt_sockaddr_t                  *remote;
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index d2fbdd27..369e7f32 100644
--- a/src/nxt_php_sapi.c
+++ b/src/nxt_php_sapi.c
@@ -1038,6 +1038,17 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
         ctx->cookie = nxt_unit_sptr_get(&f->value);
     }
 
+    if (r->authorization_field != NXT_UNIT_NONE_FIELD) {
+        f = r->fields + r->authorization_field;
+
+        php_handle_auth_data(nxt_unit_sptr_get(&f->value));
+
+    } else {
+        SG(request_info).auth_digest = NULL;
+        SG(request_info).auth_user = NULL;
+        SG(request_info).auth_password = NULL;
+    }
+
     SG(sapi_headers).http_response_code = 200;
 
     SG(request_info).path_translated = NULL;
diff --git a/src/nxt_router.c b/src/nxt_router.c
index 9dd5c30e..871602e4 100644
--- a/src/nxt_router.c
+++ b/src/nxt_router.c
@@ -5169,6 +5169,7 @@ nxt_router_prepare_msg(nxt_task_t *task, nxt_http_request_t *r,
     req->content_length_field = NXT_UNIT_NONE_FIELD;
     req->content_type_field   = NXT_UNIT_NONE_FIELD;
     req->cookie_field         = NXT_UNIT_NONE_FIELD;
+    req->authorization_field  = NXT_UNIT_NONE_FIELD;
 
     dst_field = req->fields;
 
@@ -5193,6 +5194,9 @@ nxt_router_prepare_msg(nxt_task_t *task, nxt_http_request_t *r,
 
         } else if (field == r->cookie) {
             req->cookie_field = dst_field - req->fields;
+
+        } else if (field == r->authorization) {
+            req->authorization_field = dst_field - req->fields;
         }
 
         nxt_debug(task, "add field 0x%04Xd, %d, %d, %p : %d %p",
diff --git a/src/nxt_unit_request.h b/src/nxt_unit_request.h
index fede00d2..5dbf648d 100644
--- a/src/nxt_unit_request.h
+++ b/src/nxt_unit_request.h
@@ -31,6 +31,7 @@ struct nxt_unit_request_s {
     uint32_t              content_length_field;
     uint32_t              content_type_field;
     uint32_t              cookie_field;
+    uint32_t              authorization_field;
 
     uint64_t              content_length;