/* $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"
#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)
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)
}
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()
/* }}} */
efree(HTTP_G(ctype));
HTTP_G(ctype) = NULL;
}
+
#ifdef HTTP_HAVE_CURL
if (HTTP_G(curlbuf).data) {
efree(HTTP_G(curlbuf).data);
HTTP_G(curlbuf).free = 0;
}
#endif
+
return SUCCESS;
}
/* }}} */