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

[Stanislav Malyshev]

stas            Thu Dec 18 14:28:35 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /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.9&r2=1.136.2.2.2.10&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.9 
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.10
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.9     Mon Dec 31 
07:20:15 2007
+++ php-src/sapi/apache2filter/sapi_apache2.c   Thu Dec 18 14:28:35 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.9 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.10 2008/12/18 14:28:35 stas Exp $ */
 
 #include <fcntl.h>
 
@@ -411,6 +411,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.17&r2=1.57.2.10.2.18&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.17 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.18
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.17   Wed Jan 16 
15:50:37 2008
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Dec 18 14:28:35 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.17 2008/01/16 15:50:37 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.18 2008/12/18 14:28:35 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -456,6 +456,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