diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 4aac2d2862..d477a141a7 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -485,7 +485,7 @@ static void init_request_info(TSRMLS_D) tmp = uudecode(r->pool, authorization); SG(request_info).auth_user = NULL; tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); - if (tmp_user) { + if (SG(request_info).auth_user) { r->connection->user = pstrdup(r->connection->pool, tmp_user); r->connection->ap_auth_type = "Basic"; SG(request_info).auth_user = estrdup(tmp_user); diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 516a465c2b..547aed7400 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -583,7 +583,7 @@ static void init_request_info(TSRMLS_D) tmp = uudecode(r->pool, authorization); SG(request_info).auth_user = NULL; tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); - if (tmp_user) { + if (SG(request_info).auth_user) { r->connection->user = pstrdup(r->connection->pool, tmp_user); r->connection->ap_auth_type = "Basic"; SG(request_info).auth_user = estrdup(tmp_user); diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e2028d36ca..66089024b5 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -177,7 +177,7 @@ static int module_name_cmp(const void *a, const void *b TSRMLS_DC) Bucket *f = *((Bucket **) a); Bucket *s = *((Bucket **) b); - return strcasecmp(((zend_module_entry *)f->pData)->name, + return strcmp(((zend_module_entry *)f->pData)->name, ((zend_module_entry *)s->pData)->name); } diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 2af1cb7ce3..fbc6f8b01e 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -132,7 +132,7 @@ static int module_name_cmp(const void *a, const void *b TSRMLS_DC) Bucket *f = *((Bucket **) a); Bucket *s = *((Bucket **) b); - return strcasecmp(((zend_module_entry *)f->pData)->name, + return strcmp(((zend_module_entry *)f->pData)->name, ((zend_module_entry *)s->pData)->name); } |