summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-11-07 13:16:14 +0000
committerSascha Schumann <sas@php.net>1999-11-07 13:16:14 +0000
commite5983e9ef5ae6f8d9c5fc9b96823b1b3d90c63a6 (patch)
tree903f4d9a38491d041ecf161a45f6cd3c67002334
parent880d7666ab8b898fba6660292a9f420915be66ee (diff)
downloadphp-git-e5983e9ef5ae6f8d9c5fc9b96823b1b3d90c63a6.tar.gz
(php_ns_request_ctor) enable HTTP Access Authentication
(php_ns_hash_environment) supply PATH_TRANSLATED to scripts
-rw-r--r--sapi/aolserver/aolserver.c19
1 files 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;
}