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

[Stanislav Malyshev]

stas            Wed Dec 17 11:33:56 2008 UTC

  Modified files:              
    /php-src/sapi/apache2filter sapi_apache2.c 
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  fix #46005: User not consistently logged under Apache2
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.149&r2=1.150&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.149 
php-src/sapi/apache2filter/sapi_apache2.c:1.150
--- php-src/sapi/apache2filter/sapi_apache2.c:1.149     Thu Nov 13 13:41:59 2008
+++ php-src/sapi/apache2filter/sapi_apache2.c   Wed Dec 17 11:33:56 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.149 2008/11/13 13:41:59 lbarnaud Exp $ */
+/* $Id: sapi_apache2.c,v 1.150 2008/12/17 11:33:56 stas Exp $ */
 
 #include <fcntl.h>
 
@@ -434,6 +434,10 @@
        apr_table_unset(f->r->headers_out, "ETag");
        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);
        php_request_startup(TSRMLS_C);
 }
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.88 
php-src/sapi/apache2handler/sapi_apache2.c:1.89
--- php-src/sapi/apache2handler/sapi_apache2.c:1.88     Thu Nov 13 10:33:08 2008
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Dec 17 11:33:56 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.88 2008/11/13 10:33:08 lbarnaud Exp $ */
+/* $Id: sapi_apache2.c,v 1.89 2008/12/17 11:33:56 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -471,6 +471,9 @@
        apr_table_unset(r->headers_out, "ETag");
        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);
        return php_request_startup(TSRMLS_C);
 }



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