cvs: php4 /sapi/apache mod_php4.c
| From: | Rasmus Lerdorf | Date: | Mon, 19 Aug 2002 15:52:22 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13464@lists.php.net to get a copy of this message | ||
rasmus Mon Aug 19 11:52:22 2002 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Fix xbithack bug finally (see bug #16515)
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.137 php4/sapi/apache/mod_php4.c:1.138
--- php4/sapi/apache/mod_php4.c:1.137 Sun Aug 18 09:05:44 2002
+++ php4/sapi/apache/mod_php4.c Mon Aug 19 11:52:21 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.137 2002/08/18 13:05:44 sesser Exp $ */
+/* $Id: mod_php4.c,v 1.138 2002/08/19 15:52:21 rasmus Exp $ */
#include "php_apache_http.h"
@@ -758,13 +758,17 @@
int php_xbithack_handler(request_rec * r)
{
php_apache_info_struct *conf;
+ HashTable *per_dir_conf;
- conf = (php_apache_info_struct *) get_module_config(r->per_dir_config, &php4_module);
if (!(r->finfo.st_mode & S_IXUSR)) {
r->allowed |= (1 << METHODS) - 1;
return DECLINED;
}
- if (conf->xbithack == 0) {
+ per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
+ if (per_dir_conf) {
+ 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;
return DECLINED;
}