cvs: php-src(PHP_5_1) /sapi/apache mod_php5.c

From: Date: Fri, 06 Jan 2006 18:06:38 +0000
Subject: cvs: php-src(PHP_5_1) /sapi/apache mod_php5.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-36440@lists.php.net to get a copy of this message
rasmus Fri Jan 6 18:06:38 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/sapi/apache mod_php5.c Log: MFH: I don't recall the reason for messing with r->allowed here, so let's get rid of it (and see who screams). This should fix bug #32561 http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.4&r2=1.19.2.5&diff_format=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.19.2.4 php-src/sapi/apache/mod_php5.c:1.19.2.5 --- php-src/sapi/apache/mod_php5.c:1.19.2.4 Sun Jan 1 12:50:18 2006 +++ php-src/sapi/apache/mod_php5.c Fri Jan 6 18:06:38 2006 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.19.2.4 2006/01/01 12:50:18 sniper Exp $ */ +/* $Id: mod_php5.c,v 1.19.2.5 2006/01/06 18:06:38 rasmus Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -593,7 +593,6 @@ */ if (!AP(engine)) { r->content_type = php_apache_get_default_mimetype(r TSRMLS_CC); - r->allowed |= (1 << METHODS) - 1; zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); @@ -851,7 +850,6 @@ TSRMLS_FETCH(); if (!(r->finfo.st_mode & S_IXUSR)) { - r->allowed |= (1 << METHODS) - 1; return DECLINED; } per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module); @@ -859,7 +857,6 @@ zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC); } if(!AP(xbithack)) { - r->allowed |= (1 << METHODS) - 1; zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();

« previous php.cvs (#36440) next »