* -dev version

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 0cf01ae3ea9f7291397710398859be8549216232..bdaed8a86b3b888afeb08cbe6c86fdd460e7c2ae 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1069,22 +1069,30 @@ static void php_http_init_globals(zend_http_globals *http_globals)
 }
 /* }}} */
 
-/* {{{ PHP_INI */
-PHP_INI_MH(update_allowed_methods)
+/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
+#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
+static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
 {
-       if (SG(request_info).request_method && new_value_length && (!strstr(new_value, SG(request_info).request_method))) {
-               char *allow_header = emalloc(new_value_length + sizeof("Allow: "));
-               sprintf(allow_header, "Allow: %s", new_value);
+       if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
+               char *allow_header = emalloc(length + sizeof("Allow: "));
+               sprintf(allow_header, "Allow: %s", methods);
                http_send_header(allow_header);
                efree(allow_header);
                http_send_status(405);
-               return SUCCESS;
+               zend_bailout();
        }
+}
+/* }}} */
+
+/* {{{ PHP_INI */
+PHP_INI_MH(update_allowed_methods)
+{
+       http_check_allowed_methods(new_value, new_value_length);
        return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
 PHP_INI_BEGIN()
-       STD_PHP_INI_ENTRY("http.allowed_methods", "HEAD,GET,POST", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+       STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -1114,14 +1122,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 PHP_RINIT_FUNCTION(http)
 {
        char *allowed_methods = INI_STR("http.allowed_methods");
-       int am_len;
-       if (SG(request_info).request_method && (am_len = strlen(allowed_methods)) && (!strstr(allowed_methods, SG(request_info).request_method))) {
-               char *allow_header = emalloc(am_len + sizeof("Allow: "));
-               sprintf(allow_header, "Allow: %s", allowed_methods);
-               http_send_header(allow_header);
-               efree(allow_header);
-               http_send_status(405);
-       }
+       http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
        return SUCCESS;
 }
 /* }}} */