cvs: php4(PHP_4_2_0) /sapi/apache mod_php4.c
| From: | Rasmus Lerdorf | Date: | Thu, 22 Aug 2002 14:45:57 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13569@lists.php.net to get a copy of this message | ||
rasmus Thu Aug 22 10:45:57 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/sapi/apache mod_php4.c
Log:
MFH the xbithack fix
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.127.2.3 php4/sapi/apache/mod_php4.c:1.127.2.4
--- php4/sapi/apache/mod_php4.c:1.127.2.3 Sat Aug 17 11:50:20 2002
+++ php4/sapi/apache/mod_php4.c Thu Aug 22 10:45:56 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.127.2.3 2002/08/17 15:50:20 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.127.2.4 2002/08/22 14:45:56 rasmus Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -773,13 +773,18 @@
int php_xbithack_handler(request_rec * r)
{
php_apache_info_struct *conf;
+ HashTable *per_dir_conf;
+ TSRMLS_FETCH();
- 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;
}