X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=c68f61d33740edadcb30c762f0adf6fbba3bec69;hp=9b5c7f6116165f143728bde2b8a81cd947109db3;hb=d6a9379d1794b38dc6868dd6486aedb63c993332;hpb=815d3dc46b3c98fded874db7b8ef5f0f70dd9927

diff --git a/http.c b/http.c
index 9b5c7f6..c68f61d 100644
--- a/http.c
+++ b/http.c
@@ -15,13 +15,20 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
 
+#ifdef HTTP_HAVE_CURL
+#	ifdef PHP_WIN32
+#		define _WINSOCKAPI_
+#		include <winsock2.h>
+#		include <sys/types.h>
+#	endif
+#	include <curl/curl.h>
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "snprintf.h"
@@ -42,14 +49,6 @@
 #endif
 
 #ifdef HTTP_HAVE_CURL
-
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#		include <sys/types.h>
-#	endif
-
-#	include <curl/curl.h>
-
 /* {{{ ARG_INFO */
 #	ifdef ZEND_BEGIN_ARG_INFO
 ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
@@ -417,7 +416,19 @@ PHP_INI_MH(update_allowed_methods)
 }
 
 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)
+	STD_PHP_INI_ENTRY("http.allowed_methods",
+		/* HTTP 1.1 */
+		"GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, "
+		/* WebDAV - RFC 2518 * /
+		"PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, "
+		/* WebDAV Versioning - RFC 3253 * /
+		"VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, "
+		"MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, "
+		/* WebDAV Access Control - RFC 3744 * /
+		"ACL, "
+		/* END */
+		,
+		PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
 PHP_INI_END()
 /* }}} */