* ditch warnings

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 43f15461e684ea794ea6e386c4644836bd5378ee..1261de8a3855470840f66c392b32339ba0561e81 100644 (file)
--- a/http.c
+++ b/http.c
@@ -22,9 +22,7 @@
 
 #ifdef HTTP_HAVE_CURL
 #      ifdef PHP_WIN32
-#              define _WINSOCKAPI_
 #              include <winsock2.h>
-#              include <sys/types.h>
 #      endif
 #      include <curl/curl.h>
 #endif
@@ -416,8 +414,18 @@ PHP_INI_MH(update_allowed_methods)
 }
 
 PHP_INI_BEGIN()
-       STD_PHP_INI_ENTRY("http.allowed_methods", 
-               "OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK", 
+       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()
 /* }}} */