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

diff --git a/http.c b/http.c
index 21939a0..0132ff9 100644
--- a/http.c
+++ b/http.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -22,12 +23,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"
 
@@ -439,10 +443,14 @@ PHP_FUNCTION(http_cache_etag)
 	php_end_ob_buffers(0 TSRMLS_CC);
 	http_send_header("Cache-Control: private, must-revalidate, max-age=0");
 
+	if (etag_len) {
+		RETURN_SUCCESS(http_send_etag(etag, etag_len));
+	}
+
 	/* if no etag is given and we didn't already
 	 * start ob_etaghandler -- start it
 	 */
-	if (!HTTP_G(etag_started) && !etag_len) {
+	if (!HTTP_G(etag_started)) {
 		php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC);
 		HTTP_G(etag_started) = 1;
 		RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC));
@@ -457,7 +465,6 @@ PHP_FUNCTION(http_cache_etag)
 		}
 	}
 
-	RETURN_SUCCESS(http_send_etag(etag, etag_len));
 }
 /* }}} */
 
@@ -1062,13 +1069,42 @@ 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 void _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);
+		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", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", 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 +1114,46 @@ 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");
+	http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+	return SUCCESS;
+}
+/* }}} */
+
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-	if (HTTP_G(ctype)) {
-		efree(HTTP_G(ctype));
-	}
+	HTTP_G(etag_started) = 0;
+	HTTP_G(lmod) = 0;
+
 	if (HTTP_G(etag)) {
 		efree(HTTP_G(etag));
+		HTTP_G(etag) = NULL;
+	}
+
+	if (HTTP_G(ctype)) {
+		efree(HTTP_G(ctype));
+		HTTP_G(ctype) = 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 +1174,8 @@ PHP_MINFO_FUNCTION(http)
 #endif
 	);
 	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */