X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=5aac8211837c9e01dd24b68e5cb3e81fffac4cbb;hb=48332dd93149488fe3f40b2163378d7988e10599;hp=21939a062282561497b890a8456f8e2d7bdc7b7f;hpb=8d7fee64c740137b693630ad82374c11d1aaa76a;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index 21939a0..5aac821 100644
--- a/http.c
+++ b/http.c
@@ -22,12 +22,15 @@
 #endif
 
 #include "php.h"
+#include "php_ini.h"
 #include "snprintf.h"
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
 #include "ext/standard/php_smart_str.h"
 
+#include "SAPI.h"
+
 #include "php_http.h"
 #include "php_http_api.h"
 
@@ -1062,13 +1065,45 @@ static void php_http_init_globals(zend_http_globals *http_globals)
 	http_globals->curlbuf.hdrs.used = 0;
 	http_globals->curlbuf.hdrs.free = 0;
 #endif
+	http_globals->allowed_methods = NULL;
+}
+/* }}} */
+
+/* {{{ 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 STATUS _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
+{
+	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 FAILURE;
+	}
+	return SUCCESS;
 }
 /* }}} */
 
+/* {{{ PHP_INI */
+PHP_INI_MH(update_allowed_methods)
+{
+	if (SUCCESS != http_check_allowed_methods(new_value, new_value_length)) {
+		return FAILURE;
+	}
+	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)
+PHP_INI_END()
+/* }}} */
+
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
 {
 	ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
+	REGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
 	REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
@@ -1078,21 +1113,41 @@ PHP_MINIT_FUNCTION(http)
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION */
+PHP_MSHUTDOWN_FUNCTION(http)
+{
+	UNREGISTER_INI_ENTRIES();
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RINIT_FUNCTION */
+PHP_RINIT_FUNCTION(http)
+{
+	char *allowed_methods = INI_STR("http.allowed_methods");
+	return http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+}
+/* }}} */
+
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
 	if (HTTP_G(ctype)) {
 		efree(HTTP_G(ctype));
+		HTTP_G(ctype) = NULL;
 	}
 	if (HTTP_G(etag)) {
 		efree(HTTP_G(etag));
+		HTTP_G(etag) = NULL;
 	}
 #ifdef HTTP_HAVE_CURL
 	if (HTTP_G(curlbuf).body.data) {
 		efree(HTTP_G(curlbuf).body.data);
+		HTTP_G(curlbuf).body.data = NULL;
 	}
 	if (HTTP_G(curlbuf).hdrs.data) {
 		efree(HTTP_G(curlbuf).hdrs.data);
+		HTTP_G(curlbuf).hdrs.data = NULL;
 	}
 #endif
 	return SUCCESS;
@@ -1113,6 +1168,8 @@ PHP_MINFO_FUNCTION(http)
 #endif
 	);
 	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */