[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

[Stanislav Malyshev]

stas            Wed Dec 17 11:34:50 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/sapi/apache2filter sapi_apache2.c 
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  MFH fix #46005
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.2.2.8.2.5&r2=1.136.2.2.2.8.2.6&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.5 
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.6
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.5 Thu Nov 13 
13:41:07 2008
+++ php-src/sapi/apache2filter/sapi_apache2.c   Wed Dec 17 11:34:50 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.5 2008/11/13 13:41:07 lbarnaud Exp $ 
*/
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.6 2008/12/17 11:34:50 stas Exp $ */
 
 #include <fcntl.h>
 
@@ -427,6 +427,10 @@
        if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(f->r))) {
                auth = apr_table_get(f->r->headers_in, "Authorization");
                php_handle_auth_data(auth TSRMLS_CC);
+               if (SG(request_info).auth_user == NULL && f->r->user) {
+                       SG(request_info).auth_user = estrdup(f->r->user);
+               }
+               ctx->r->user = apr_pstrdup(ctx->r->pool, 
SG(request_info).auth_user);
        } else {
                SG(request_info).auth_user = NULL;
                SG(request_info).auth_password = NULL;
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.15.2.4&r2=1.57.2.10.2.15.2.5&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.4 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.5
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.4       Thu Nov 
13 10:14:04 2008
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Dec 17 11:34:50 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.4 2008/11/13 10:14:04 lbarnaud Exp $ 
*/
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.5 2008/12/17 11:34:50 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -472,6 +472,9 @@
        if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) {
                auth = apr_table_get(r->headers_in, "Authorization");
                php_handle_auth_data(auth TSRMLS_CC);
+               if (SG(request_info).auth_user == NULL && r->user) {
+                       SG(request_info).auth_user = estrdup(r->user);
+               }
                ctx->r->user = apr_pstrdup(ctx->r->pool, 
SG(request_info).auth_user);
        } else {
                SG(request_info).auth_user = NULL;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php