X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=43f15461e684ea794ea6e386c4644836bd5378ee;hp=7cb3c4cdf8b6d06d880777c0cbd2679b490fbdcf;hb=e93a92c530d8adb0e99682b458edcb05efc7db0d;hpb=a12e8ddfaa5a94e76261f165b0c0299c87b886b1 diff --git a/http.c b/http.c index 7cb3c4c..43f1546 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 +# include +# endif +# include +#endif + #include "php.h" #include "php_ini.h" #include "snprintf.h" @@ -42,14 +49,6 @@ #endif #ifdef HTTP_HAVE_CURL - -# ifdef PHP_WIN32 -# include -# include -# endif - -# include - /* {{{ ARG_INFO */ # ifdef ZEND_BEGIN_ARG_INFO ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) @@ -338,7 +337,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) @@ -416,7 +416,9 @@ 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", + "OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK", + PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals) PHP_INI_END() /* }}} */