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

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index f7fe4aea35cabc0d1ed4479d01106b73492a6b87..a6b40d8e43f7f0c3e7b108a1051a4e6f975357c5 100644 (file)
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -593,7 +593,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                 */
                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 @@ static int php_xbithack_handler(request_rec * r)
        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 @@ static int php_xbithack_handler(request_rec * r)
                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();