From e5983e9ef5ae6f8d9c5fc9b96823b1b3d90c63a6 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Sun, 7 Nov 1999 13:16:14 +0000 Subject: [PATCH] (php_ns_request_ctor) enable HTTP Access Authentication (php_ns_hash_environment) supply PATH_TRANSLATED to scripts --- sapi/aolserver/aolserver.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index f80f04d5a7..14e702d915 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -20,7 +20,6 @@ * TODO: * - write documentation * - CGI/1.1 conformance - * - HTTP basic auth */ /* $Id$ */ @@ -321,6 +320,9 @@ php_ns_hash_environment(NSLS_D CLS_DC ELS_DC PLS_DC SLS_DC) strncpy(buf, Ns_ConnPeer(NSG(conn)), 511); ADD_STRING("REMOTE_ADDR"); + strncpy(buf, SG(request_info).path_translated, 511); + ADD_STRING("PATH_TRANSLATED"); + MAKE_STD_ZVAL(pval); pval->type = IS_LONG; pval->value.lval = Ns_InfoBootTime(); @@ -365,6 +367,7 @@ php_ns_request_ctor(NSLS_D SLS_DC) Ns_DString ds; char *root; int index; + char *tmp; server = Ns_ConnServer(NSG(conn)); @@ -383,8 +386,18 @@ php_ns_request_ctor(NSLS_D SLS_DC) index = Ns_SetIFind(NSG(conn)->headers, "content-type"); SG(request_info).content_type = index == -1 ? NULL : Ns_SetValue(NSG(conn)->headers, index); - SG(request_info).auth_user = NULL; - SG(request_info).auth_password = NULL; + + tmp = Ns_ConnAuthUser(NSG(conn)); + if(tmp) { + tmp = estrdup(tmp); + } + SG(request_info).auth_user = tmp; + + tmp = Ns_ConnAuthPasswd(NSG(conn)); + if(tmp) { + tmp = estrdup(tmp); + } + SG(request_info).auth_password = tmp; NSG(data_avail) = SG(request_info).content_length; } -- 2.50.1