X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=62ae4747c148ed376b8c3ef1fd5d19544478da16;hp=fd925f69416975c0650484404ace860572f2da58;hb=46ef6bdcdea32310a17dc95eadb14936125dcb51;hpb=6abb3349f9ec911fd9086aa2f38992abb4f2e12a diff --git a/php_http.h b/php_http.h index fd925f6..62ae474 100644 --- a/php_http.h +++ b/php_http.h @@ -18,11 +18,12 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define HTTP_PEXT_VERSION "0.7.0-dev" +#define HTTP_PEXT_VERSION "0.7.0" /* make compile on Win32 */ #include "php_streams.h" #include "ext/standard/md5.h" +#include "phpstr/phpstr.h" extern zend_module_entry http_module_entry; #define phpext_http_ptr &http_module_entry @@ -42,8 +43,6 @@ typedef struct { #ifdef HTTP_HAVE_CURL -#include "phpstr/phpstr.h" - #ifdef PHP_WIN32 # include #endif @@ -56,7 +55,7 @@ typedef struct { } http_request_object; typedef enum { - HTTP_GET, + HTTP_GET = 1, HTTP_HEAD, HTTP_POST, } http_request_method; @@ -119,8 +118,15 @@ PHP_METHOD(HttpRequest, __destruct); PHP_METHOD(HttpRequest, setOptions); PHP_METHOD(HttpRequest, getOptions); PHP_METHOD(HttpRequest, unsetOptions); -PHP_METHOD(HttpRequest, addHeader); -PHP_METHOD(HttpRequest, addCookie); +PHP_METHOD(HttpRequest, setSslOptions); +PHP_METHOD(HttpRequest, getSslOptions); +PHP_METHOD(HttpRequest, unsetSslOptions); +PHP_METHOD(HttpRequest, addHeaders); +PHP_METHOD(HttpRequest, getHeaders); +PHP_METHOD(HttpRequest, unsetHeaders); +PHP_METHOD(HttpRequest, addCookies); +PHP_METHOD(HttpRequest, getCookies); +PHP_METHOD(HttpRequest, unsetCookies); PHP_METHOD(HttpRequest, setMethod); PHP_METHOD(HttpRequest, getMethod); PHP_METHOD(HttpRequest, setURL); @@ -141,6 +147,7 @@ PHP_METHOD(HttpRequest, unsetPostFiles); PHP_METHOD(HttpRequest, send); PHP_METHOD(HttpRequest, getResponseData); PHP_METHOD(HttpRequest, getResponseHeader); +PHP_METHOD(HttpRequest, getResponseCookie); PHP_METHOD(HttpRequest, getResponseCode); PHP_METHOD(HttpRequest, getResponseBody); PHP_METHOD(HttpRequest, getResponseInfo); @@ -199,6 +206,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http) char *allowed_methods; #ifdef HTTP_HAVE_CURL phpstr curlbuf; +# if LIBCURL_VERSION_NUM < 0x070c00 + char curlerr[CURL_ERROR_SIZE + 1]; +# endif zend_llist to_free; #endif /* HTTP_HAVE_CURL */ ZEND_END_MODULE_GLOBALS(http)