X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=8aa524bb48f828a6b9debe102f19da1c74cb5a51;hp=b2bdbe24b63d408c728ac57afc9e3e7d23ad2593;hb=e47ee304be6758fbbfd238476f8a6bda9090fe12;hpb=a856e9055f2de647fdb3c7ff89238f6b17a1217e diff --git a/php_http.h b/php_http.h index b2bdbe2..8aa524b 100644 --- a/php_http.h +++ b/php_http.h @@ -18,132 +18,79 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_EXT_HTTP_VERSION "0.5.0-dev" +#define HTTP_PEXT_VERSION "0.10.0dev" /* make compile on Win32 */ -#include "php_streams.h" +#ifdef HTTP_HAVE_CURL +# ifdef PHP_WIN32 +# include +# endif +# include +#endif #include "ext/standard/md5.h" +#include "phpstr/phpstr.h" extern zend_module_entry http_module_entry; #define phpext_http_ptr &http_module_entry -#ifdef ZTS -# include "TSRM.h" -# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v) -#else -# define HTTP_G(v) (http_globals.v) -#endif - -#ifndef ZEND_ENGINE_2 -# include "php_http_build_query.h" -#else +extern int http_module_number; -#ifdef HTTP_HAVE_CURL -typedef struct { - struct { - char *data; - size_t used; - size_t free; - } body; - struct { - char *data; - size_t used; - size_t free; - } hdrs; -} http_curlbuf; - -typedef enum { - HTTP_GET, - HTTP_HEAD, - HTTP_POST, -} http_request_method; -#endif +ZEND_BEGIN_MODULE_GLOBALS(http) -PHP_METHOD(HTTPi, date); -PHP_METHOD(HTTPi, absoluteURI); -PHP_METHOD(HTTPi, negotiateLanguage); -PHP_METHOD(HTTPi, negotiateCharset); -PHP_METHOD(HTTPi, redirect); -PHP_METHOD(HTTPi, sendStatus); -PHP_METHOD(HTTPi, sendLastModified); -PHP_METHOD(HTTPi, sendContentType); -PHP_METHOD(HTTPi, sendContentDisposition); -PHP_METHOD(HTTPi, matchModified); -PHP_METHOD(HTTPi, matchEtag); -PHP_METHOD(HTTPi, cacheLastModified); -PHP_METHOD(HTTPi, cacheEtag); -PHP_METHOD(HTTPi, chunkedDecode); -PHP_METHOD(HTTPi, splitResponse); -PHP_METHOD(HTTPi, parseHeaders); -PHP_METHOD(HTTPi, getRequestHeaders); -#ifdef HTTP_HAVE_CURL -PHP_METHOD(HTTPi, get); -PHP_METHOD(HTTPi, head); -PHP_METHOD(HTTPi, postData); -PHP_METHOD(HTTPi, postArray); -#endif -PHP_METHOD(HTTPi, authBasic); -PHP_METHOD(HTTPi, authBasicCallback); - - -PHP_METHOD(HTTPi_Response, __construct);/* -PHP_METHOD(HTTPi_Response, __destruct);*/ -PHP_METHOD(HTTPi_Response, setETag); -PHP_METHOD(HTTPi_Response, getETag); -PHP_METHOD(HTTPi_Response, setContentDisposition); -PHP_METHOD(HTTPi_Response, getContentDisposition); -PHP_METHOD(HTTPi_Response, setContentType); -PHP_METHOD(HTTPi_Response, getContentType); -PHP_METHOD(HTTPi_Response, setCache); -PHP_METHOD(HTTPi_Response, getCache); -PHP_METHOD(HTTPi_Response, setCacheControl); -PHP_METHOD(HTTPi_Response, getCacheControl); -PHP_METHOD(HTTPi_Response, setGzip); -PHP_METHOD(HTTPi_Response, getGzip); -PHP_METHOD(HTTPi_Response, setData); -PHP_METHOD(HTTPi_Response, getData); -PHP_METHOD(HTTPi_Response, setFile); -PHP_METHOD(HTTPi_Response, getFile); -PHP_METHOD(HTTPi_Response, setStream); -PHP_METHOD(HTTPi_Response, getStream); -PHP_METHOD(HTTPi_Response, send); + struct _http_globals_etag { + zend_bool started; + PHP_MD5_CTX md5ctx; + } etag; + + struct _http_globals_log { + char *cache; + } log; + + struct _http_globals_send { + double throttle_delay; + size_t buffer_size; + char *content_type; + char *unquoted_etag; + time_t last_modified; + } send; + + struct _http_globals_request { + struct _http_globals_request_methods { + char *allowed; + HashTable custom; + } methods; #ifdef HTTP_HAVE_CURL - -PHP_METHOD(HTTPi_Request, __construct); -PHP_METHOD(HTTPi_Request, __destruct); -PHP_METHOD(HTTPi_Request, setOptions); -PHP_METHOD(HTTPi_Request, getOptions); -PHP_METHOD(HTTPi_Request, setMethod); -PHP_METHOD(HTTPi_Request, getMethod); -PHP_METHOD(HTTPi_Request, setURL); -PHP_METHOD(HTTPi_Request, getURL); -PHP_METHOD(HTTPi_Request, setContentType); -PHP_METHOD(HTTPi_Request, getContentType); -PHP_METHOD(HTTPi_Request, setQueryData); -PHP_METHOD(HTTPi_Request, getQueryData); -PHP_METHOD(HTTPi_Request, addQueryData); -PHP_METHOD(HTTPi_Request, unsetQueryData);/* -PHP_METHOD(HTTPi_Request, setPostData); -PHP_METHOD(HTTPi_Request, addPostData); -PHP_METHOD(HTTPi_Request, unsetPostData); -PHP_METHOD(HTTPi_Request, addPostFile);*/ -PHP_METHOD(HTTPi_Request, send); -PHP_METHOD(HTTPi_Request, getResponseData); -PHP_METHOD(HTTPi_Request, getResponseHeaders); -PHP_METHOD(HTTPi_Request, getResponseBody); -PHP_METHOD(HTTPi_Request, getResponseInfo); - + struct _http_globlas_request_copies { + zend_llist strings; + zend_llist slists; + zend_llist contexts; + } copies; +# if LIBCURL_VERSION_NUM < 0x070c00 + char error[CURL_ERROR_SIZE + 1]; +# endif #endif /* HTTP_HAVE_CURL */ + } request; -#endif /* ZEND_ENGINE_2 */ +ZEND_END_MODULE_GLOBALS(http) +#ifdef ZTS +# include "TSRM.h" +# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v) +# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)]) +#else +# define HTTP_G(v) (http_globals.v) +# define HTTP_GLOBALS (&http_globals) +#endif +#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS; +PHP_FUNCTION(http_test); PHP_FUNCTION(http_date); PHP_FUNCTION(http_absolute_uri); PHP_FUNCTION(http_negotiate_language); PHP_FUNCTION(http_negotiate_charset); PHP_FUNCTION(http_redirect); +PHP_FUNCTION(http_throttle); PHP_FUNCTION(http_send_status); PHP_FUNCTION(http_send_last_modified); PHP_FUNCTION(http_send_content_type); @@ -159,16 +106,27 @@ PHP_FUNCTION(http_chunked_decode); PHP_FUNCTION(http_split_response); PHP_FUNCTION(http_parse_headers); PHP_FUNCTION(http_get_request_headers); +PHP_FUNCTION(http_get_request_body); +PHP_FUNCTION(http_match_request_header); #ifdef HTTP_HAVE_CURL PHP_FUNCTION(http_get); PHP_FUNCTION(http_head); PHP_FUNCTION(http_post_data); -PHP_FUNCTION(http_post_array); -#endif +PHP_FUNCTION(http_post_fields); +PHP_FUNCTION(http_put_file); +PHP_FUNCTION(http_put_stream); +/*PHP_FUNCTION(http_request)*/ +PHP_FUNCTION(http_request_method_register); +PHP_FUNCTION(http_request_method_unregister); +PHP_FUNCTION(http_request_method_exists); +PHP_FUNCTION(http_request_method_name); +#endif /* HTTP_HAVE_CURL */ PHP_FUNCTION(http_auth_basic); PHP_FUNCTION(http_auth_basic_cb); - -PHP_FUNCTION(ob_httpetaghandler); +#ifndef ZEND_ENGINE_2 +PHP_FUNCTION(http_build_query); +#endif /* ZEND_ENGINE_2 */ +PHP_FUNCTION(ob_etaghandler); PHP_MINIT_FUNCTION(http); PHP_MSHUTDOWN_FUNCTION(http); @@ -176,19 +134,6 @@ PHP_RINIT_FUNCTION(http); PHP_RSHUTDOWN_FUNCTION(http); PHP_MINFO_FUNCTION(http); -ZEND_BEGIN_MODULE_GLOBALS(http) - zend_bool etag_started; - PHP_MD5_CTX etag_md5; - php_stream_statbuf ssb; - char *ctype; - char *etag; - time_t lmod; - char *allowed_methods; -#ifdef HTTP_HAVE_CURL - http_curlbuf curlbuf; -#endif -ZEND_END_MODULE_GLOBALS(http) - #endif /* PHP_HTTP_H */ /*