X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=494a1aae7a6d198c6808a320a9623cc487b500e3;hp=e0f61fc893f027a1525a185a5e81444e5180da1b;hb=2b7331c5fdb73cb48f7f60a8e4ec88766581ced3;hpb=af674f03c32f0f56b7f8c67e61c7e86b3ea23be5 diff --git a/http.c b/http.c index e0f61fc..494a1aa 100644 --- a/http.c +++ b/http.c @@ -27,44 +27,50 @@ # include #endif +#include + #include "php.h" #include "php_ini.h" -#include "snprintf.h" #include "ext/standard/info.h" -#include "ext/session/php_session.h" -#include "ext/standard/php_string.h" -#include "ext/standard/php_smart_str.h" #include "SAPI.h" #include "php_http.h" -#include "php_http_api.h" -#include "php_http_curl_api.h" #include "php_http_std_defs.h" +#include "php_http_send_api.h" + +#ifdef ZEND_ENGINE_2 +# include "php_http_util_object.h" +# include "php_http_message_object.h" +# include "php_http_response_object.h" +# ifdef HTTP_HAVE_CURL +# include "php_http_request_object.h" +# endif +# include "php_http_exception_object.h" +#endif #include "phpstr/phpstr.h" #ifdef HTTP_HAVE_CURL -/* {{{ ARG_INFO */ -# ifdef ZEND_BEGIN_ARG_INFO +#ifdef ZEND_ENGINE_2 +static ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); +static ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -# else +#else static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -# endif -/* }}} ARG_INFO */ - +#endif /* ZEND_ENGINE_2 */ #endif /* HTTP_HAVE_CURL */ ZEND_DECLARE_MODULE_GLOBALS(http) @@ -107,250 +113,11 @@ function_entry http_functions[] = { #ifndef ZEND_ENGINE_2 PHP_FE(http_build_query, NULL) #endif - PHP_FE(ob_httpetaghandler, NULL) - {NULL, NULL, NULL} -}; -/* }}} */ - - -#ifdef ZEND_ENGINE_2 - -/* {{{ HttpUtil */ - -zend_class_entry *http_util_ce; - -#define HTTP_UTIL_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) - -zend_function_entry http_util_class_methods[] = { - HTTP_UTIL_ME(date, http_date, NULL) - HTTP_UTIL_ME(absoluteURI, http_absolute_uri, NULL) - HTTP_UTIL_ME(negotiateLanguage, http_negotiate_language, NULL) - HTTP_UTIL_ME(negotiateCharset, http_negotiate_charset, NULL) - HTTP_UTIL_ME(redirect, http_redirect, NULL) - HTTP_UTIL_ME(sendStatus, http_send_status, NULL) - HTTP_UTIL_ME(sendLastModified, http_send_last_modified, NULL) - HTTP_UTIL_ME(sendContentType, http_send_content_type, NULL) - HTTP_UTIL_ME(sendContentDisposition, http_send_content_disposition, NULL) - HTTP_UTIL_ME(matchModified, http_match_modified, NULL) - HTTP_UTIL_ME(matchEtag, http_match_etag, NULL) - HTTP_UTIL_ME(cacheLastModified, http_cache_last_modified, NULL) - HTTP_UTIL_ME(cacheEtag, http_cache_etag, NULL) - HTTP_UTIL_ME(chunkedDecode, http_chunked_decode, NULL) - HTTP_UTIL_ME(splitResponse, http_split_response, NULL) - HTTP_UTIL_ME(parseHeaders, http_parse_headers, NULL) - HTTP_UTIL_ME(getRequestHeaders, http_get_request_headers, NULL) -#ifdef HTTP_HAVE_CURL - HTTP_UTIL_ME(get, http_get, http_request_info_ref_3) - HTTP_UTIL_ME(head, http_head, http_request_info_ref_3) - HTTP_UTIL_ME(postData, http_post_data, http_request_info_ref_4) - HTTP_UTIL_ME(postArray, http_post_array, http_request_info_ref_4) -#endif - HTTP_UTIL_ME(authBasic, http_auth_basic, NULL) - HTTP_UTIL_ME(authBasicCallback, http_auth_basic_cb, NULL) - {NULL, NULL, NULL} -}; -/* }}} HttpUtil */ - -/* {{{ HttpResponse */ - -zend_class_entry *http_response_ce; -static zend_object_handlers http_response_object_handlers; - -#define http_response_declare_default_properties(ce) _http_response_declare_default_properties(ce TSRMLS_CC) -static inline void _http_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC) -{ - DCL_PROP(PROTECTED, string, contentType, "application/x-octetstream"); - DCL_PROP(PROTECTED, string, eTag, ""); - DCL_PROP(PROTECTED, string, dispoFile, ""); - DCL_PROP(PROTECTED, string, cacheControl, "public"); - DCL_PROP(PROTECTED, string, data, ""); - DCL_PROP(PROTECTED, string, file, ""); - DCL_PROP(PROTECTED, long, stream, 0); - DCL_PROP(PROTECTED, long, lastModified, 0); - DCL_PROP(PROTECTED, long, dispoInline, 0); - DCL_PROP(PROTECTED, long, cache, 0); - DCL_PROP(PROTECTED, long, gzip, 0); - - DCL_PROP(PRIVATE, long, raw_cache_header, 0); - DCL_PROP(PRIVATE, long, send_mode, -1); -} - -#define http_response_destroy_object _http_response_destroy_object -void _http_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) -{ - http_response_object *o = object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } - efree(o); -} - -#define http_response_new_object _http_response_new_object -zend_object_value _http_response_new_object(zend_class_entry *ce TSRMLS_DC) -{ - zend_object_value ov; - http_response_object *o; - - o = ecalloc(1, sizeof(http_response_object)); - o->zo.ce = ce; - - ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - - ov.handle = zend_objects_store_put(o, http_response_destroy_object, NULL, NULL TSRMLS_CC); - ov.handlers = &http_response_object_handlers; - - return ov; -} - -zend_function_entry http_response_class_methods[] = { - PHP_ME(HttpResponse, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -/* PHP_ME(HttpResponse, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) -*/ - PHP_ME(HttpResponse, setETag, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getETag, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setContentDisposition, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getContentDisposition, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getContentType, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setCache, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getCache, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setCacheControl, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getCacheControl, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setGzip, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getGzip, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getData, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setFile, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getFile, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, setStream, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpResponse, getStream, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpResponse, send, NULL, ZEND_ACC_PUBLIC) - + PHP_FE(ob_etaghandler, NULL) {NULL, NULL, NULL} }; /* }}} */ -/* {{{ HttpRequest */ -#ifdef HTTP_HAVE_CURL - -zend_class_entry *http_request_ce; -static zend_object_handlers http_request_object_handlers; - -#define http_request_declare_default_properties(ce) _http_request_declare_default_properties(ce TSRMLS_CC) -static inline void _http_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC) -{ - DCL_PROP_N(PROTECTED, options); - DCL_PROP_N(PROTECTED, responseInfo); - DCL_PROP_N(PROTECTED, responseData); - DCL_PROP_N(PROTECTED, postData); - DCL_PROP_N(PROTECTED, postFiles); - - DCL_PROP(PROTECTED, long, method, HTTP_GET); - - DCL_PROP(PROTECTED, string, url, ""); - DCL_PROP(PROTECTED, string, contentType, ""); - DCL_PROP(PROTECTED, string, queryData, ""); - DCL_PROP(PROTECTED, string, postData, ""); -} - -#define http_request_free_object _http_request_free_object -void _http_request_free_object(zend_object /* void */ *object TSRMLS_DC) -{ - http_request_object *o = (http_request_object *) object; - - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } - if (o->ch) { - curl_easy_cleanup(o->ch); - o->ch = NULL; - } - efree(o); -} - -#define http_request_new_object _http_request_new_object -zend_object_value _http_request_new_object(zend_class_entry *ce TSRMLS_DC) -{ - zend_object_value ov; - http_request_object *o; - - o = ecalloc(1, sizeof(http_request_object)); - o->zo.ce = ce; - o->ch = curl_easy_init(); - - ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - - ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_request_free_object, NULL TSRMLS_CC); - ov.handlers = &http_request_object_handlers; - - return ov; -} - -zend_function_entry http_request_class_methods[] = { - PHP_ME(HttpRequest, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(HttpRequest, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) - - PHP_ME(HttpRequest, setOptions, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getOptions, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, unsetOptions, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, addHeader, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, addCookie, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, setMethod, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getMethod, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, setURL, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getURL, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, setContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getContentType, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, setQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, addQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, unsetQueryData, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, setPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, addPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, unsetPostData, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, addPostFile, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getPostFiles, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, unsetPostFiles, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, send, NULL, ZEND_ACC_PUBLIC) - - PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getResponseHeader, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC) - - {NULL, NULL, NULL} -}; - -#endif /* HTTP_HAVE_CURL */ -/* }}} */ - -#endif /* ZEND_ENGINE_2 */ - /* {{{ http_module_entry */ zend_module_entry http_module_entry = { #if ZEND_MODULE_API_NO >= 20010901 @@ -376,15 +143,17 @@ static void free_to_free(void *s) efree(*(char **)s); } -/* {{{ php_http_init_globals(zend_http_globals *) */ -static void php_http_init_globals(zend_http_globals *http_globals) +/* {{{ void _http_init_globals(zend_http_globals *) */ +static void _http_init_globals(zend_http_globals *http_globals) { http_globals->etag_started = 0; http_globals->ctype = NULL; http_globals->etag = NULL; http_globals->lmod = 0; #ifdef HTTP_HAVE_CURL - phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0); +# if LIBCURL_VERSION_NUM < 0x070c00 + memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr)); +# endif zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0); #endif http_globals->allowed_methods = NULL; @@ -395,14 +164,24 @@ static void php_http_init_globals(zend_http_globals *http_globals) #define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC) static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC) { - if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) { - char *allow_header = emalloc(length + sizeof("Allow: ")); - sprintf(allow_header, "Allow: %s", methods); - http_send_header(allow_header); - efree(allow_header); - http_send_status(405); - zend_bailout(); + char *found, *header; + + if (!length || !SG(request_info).request_method) { + return; + } + + if ( (found = strstr(methods, SG(request_info).request_method)) && + (found == SG(request_info).request_method || !isalpha(found[-1])) && + (!isalpha(found[strlen(SG(request_info).request_method) + 1]))) { + return; } + + header = emalloc(length + sizeof("Allow: ")); + sprintf(header, "Allow: %s", methods); + http_send_header(header); + efree(header); + http_send_status(405); + zend_bailout(); } /* }}} */ @@ -443,7 +222,7 @@ static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); } /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { - ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); + ZEND_INIT_MODULE_GLOBALS(http, _http_init_globals, NULL); REGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL @@ -457,25 +236,18 @@ PHP_MINIT_FUNCTION(http) return FAILURE; } # endif /* HTTP_CURL_USE_ZEND_MM */ - -# if LIBCURL_VERSION_NUM >= 0x070a05 - REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT); -# endif /* LIBCURL_VERSION_NUM */ #endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 - HTTP_REGISTER_CLASS(HttpUtil, http_util, NULL, ZEND_ACC_FINAL_CLASS); - HTTP_REGISTER_CLASS_EX(HttpResponse, http_response, NULL, 0); + http_util_object_init(INIT_FUNC_ARGS_PASSTHRU); + http_message_object_init(INIT_FUNC_ARGS_PASSTHRU); + http_response_object_init(INIT_FUNC_ARGS_PASSTHRU); # ifdef HTTP_HAVE_CURL - HTTP_REGISTER_CLASS_EX(HttpRequest, http_request, NULL, 0); - - REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT); + http_request_object_init(INIT_FUNC_ARGS_PASSTHRU); # endif /* HTTP_HAVE_CURL */ + http_exception_object_init(INIT_FUNC_ARGS_PASSTHRU); #endif /* ZEND_ENGINE_2 */ + return SUCCESS; } /* }}} */ @@ -485,7 +257,6 @@ PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - phpstr_dtor(&HTTP_G(curlbuf)); curl_global_cleanup(); #endif return SUCCESS; @@ -518,7 +289,9 @@ PHP_RSHUTDOWN_FUNCTION(http) } #ifdef HTTP_HAVE_CURL - phpstr_dtor(&HTTP_G(curlbuf)); +# if LIBCURL_VERSION_NUM < 0x070c00 + memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr))); +# endif #endif return SUCCESS; @@ -529,7 +302,7 @@ PHP_RSHUTDOWN_FUNCTION(http) PHP_MINFO_FUNCTION(http) { #ifdef ZEND_ENGINE_2 -# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")" +# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (" CLASS ")" #else # define HTTP_FUNC_AVAIL(CLASS) "procedural" #endif @@ -537,7 +310,7 @@ PHP_MINFO_FUNCTION(http) #ifdef HTTP_HAVE_CURL # define HTTP_CURL_VERSION curl_version() # ifdef ZEND_ENGINE_2 -# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")" +# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (" CLASS ")" # else # define HTTP_CURL_AVAIL(CLASS) "procedural" # endif @@ -556,7 +329,7 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_start(); php_info_print_table_header(2, "Functionality", "Availability"); - php_info_print_table_row(2, "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil")); + php_info_print_table_row(2, "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil, HttpMessage")); php_info_print_table_row(2, "Extended HTTP Responses:", HTTP_FUNC_AVAIL("HttpResponse")); php_info_print_table_row(2, "Extended HTTP Requests:", HTTP_CURL_AVAIL("HttpRequest")); php_info_print_table_end();