X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http.c;h=1261de8a3855470840f66c392b32339ba0561e81;hb=b0b4c6e01679dfff4b71d3075f011f70d21bd79d;hp=b46ba9ef4f2f3deb98756e893fa113f4217a23b6;hpb=85e7a5ad7604cdb1096bacfc3db06812e87c0c60;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index b46ba9e..1261de8 100644
--- a/http.c
+++ b/http.c
@@ -15,13 +15,18 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
 
+#ifdef HTTP_HAVE_CURL
+#	ifdef PHP_WIN32
+#		include <winsock2.h>
+#	endif
+#	include <curl/curl.h>
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "snprintf.h"
@@ -35,20 +40,13 @@
 #include "php_http.h"
 #include "php_http_api.h"
 #include "php_http_curl_api.h"
+#include "php_http_std_defs.h"
 
 #ifdef ZEND_ENGINE_2
 #	include "ext/standard/php_http.h"
 #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)
@@ -337,7 +335,8 @@ zend_function_entry httpi_request_class_methods[] = {
 	PHP_ME(HTTPi_Request, send, NULL, ZEND_ACC_PUBLIC)
 
 	PHP_ME(HTTPi_Request, getResponseData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getResponseHeaders, NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(HTTPi_Request, getResponseHeader, NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(HTTPi_Request, getResponseCode, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(HTTPi_Request, getResponseBody, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(HTTPi_Request, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
 
@@ -368,9 +367,10 @@ zend_module_entry http_module_entry = {
 };
 /* }}} */
 
-static void free_to_free(void **s)
+
+static void free_to_free(void *s)
 {
-	efree(*s);
+	efree(*(char **)s);
 }
 
 /* {{{ php_http_init_globals(zend_http_globals *) */
@@ -414,7 +414,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()
 /* }}} */
 
@@ -476,6 +488,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
 		efree(HTTP_G(ctype));
 		HTTP_G(ctype) = NULL;
 	}
+
 #ifdef HTTP_HAVE_CURL
 	if (HTTP_G(curlbuf).data) {
 		efree(HTTP_G(curlbuf).data);
@@ -484,6 +497,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
 		HTTP_G(curlbuf).free = 0;
 	}
 #endif
+
 	return SUCCESS;
 }
 /* }}} */