X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=6b1158636eaa0d0efa47ea15752d674500b7cbed;hp=43f15461e684ea794ea6e386c4644836bd5378ee;hb=ebe82996a0b4e436ea91d460c88165dbeb398188;hpb=e93a92c530d8adb0e99682b458edcb05efc7db0d diff --git a/http.c b/http.c index 43f1546..6b11586 100644 --- a/http.c +++ b/http.c @@ -22,9 +22,7 @@ #ifdef HTTP_HAVE_CURL # ifdef PHP_WIN32 -# define _WINSOCKAPI_ # include -# include # endif # include #endif @@ -40,13 +38,19 @@ #include "SAPI.h" #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_auth_api.h" #include "php_http_curl_api.h" -#include "php_http_std_defs.h" +#include "php_http_cache_api.h" +#include "php_http_curl_api.h" +#include "php_http_date_api.h" +#include "php_http_headers_api.h" +#include "php_http_message_api.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" -#ifdef ZEND_ENGINE_2 -# include "ext/standard/php_http.h" -#endif +#include "phpstr/phpstr.h" #ifdef HTTP_HAVE_CURL /* {{{ ARG_INFO */ @@ -79,6 +83,7 @@ ZEND_GET_MODULE(http) /* {{{ http_functions[] */ function_entry http_functions[] = { + PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) PHP_FE(http_absolute_uri, NULL) PHP_FE(http_negotiate_language, NULL) @@ -118,49 +123,377 @@ function_entry http_functions[] = { #ifdef ZEND_ENGINE_2 -/* {{{ HTTPi */ - -zend_class_entry *httpi_ce; - -#define HTTPi_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) - -zend_function_entry httpi_class_methods[] = { - HTTPi_ME(date, http_date, NULL) - HTTPi_ME(absoluteURI, http_absolute_uri, NULL) - HTTPi_ME(negotiateLanguage, http_negotiate_language, NULL) - HTTPi_ME(negotiateCharset, http_negotiate_charset, NULL) - HTTPi_ME(redirect, http_redirect, NULL) - HTTPi_ME(sendStatus, http_send_status, NULL) - HTTPi_ME(sendLastModified, http_send_last_modified, NULL) - HTTPi_ME(sendContentType, http_send_content_type, NULL) - HTTPi_ME(sendContentDisposition, http_send_content_disposition, NULL) - HTTPi_ME(matchModified, http_match_modified, NULL) - HTTPi_ME(matchEtag, http_match_etag, NULL) - HTTPi_ME(cacheLastModified, http_cache_last_modified, NULL) - HTTPi_ME(cacheEtag, http_cache_etag, NULL) - HTTPi_ME(chunkedDecode, http_chunked_decode, NULL) - HTTPi_ME(splitResponse, http_split_response, NULL) - HTTPi_ME(parseHeaders, http_parse_headers, NULL) - HTTPi_ME(getRequestHeaders, http_get_request_headers, NULL) +/* {{{ 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 - HTTPi_ME(get, http_get, http_request_info_ref_3) - HTTPi_ME(head, http_head, http_request_info_ref_3) - HTTPi_ME(postData, http_post_data, http_request_info_ref_4) - HTTPi_ME(postArray, http_post_array, http_request_info_ref_4) + 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 - HTTPi_ME(authBasic, http_auth_basic, NULL) - HTTPi_ME(authBasicCallback, http_auth_basic_cb, NULL) + HTTP_UTIL_ME(authBasic, http_auth_basic, NULL) + HTTP_UTIL_ME(authBasicCallback, http_auth_basic_cb, NULL) {NULL, NULL, NULL} }; -/* }}} HTTPi */ +/* }}} HttpUtil */ + +/* {{{ HttpMessage */ +zend_class_entry *http_message_ce; +static zend_object_handlers http_message_object_handlers; + +#define HTTP_MSG_PROPHASH_TYPE 276192743LU +#define HTTP_MSG_PROPHASH_HTTP_VERSION 1138628683LU +#define HTTP_MSG_PROPHASH_RAW 2090679983LU +#define HTTP_MSG_PROPHASH_BODY 254474387LU +#define HTTP_MSG_PROPHASH_HEADERS 3199929089LU +#define HTTP_MSG_PROPHASH_NESTED_MESSAGE 3652857165LU +#define HTTP_MSG_PROPHASH_REQUEST_METHOD 1669022159LU +#define HTTP_MSG_PROPHASH_REQUEST_URI 3208695486LU +#define HTTP_MSG_PROPHASH_RESPONSE_STATUS 3857097400LU + +#define http_message_object_read_prop _http_message_object_read_prop +static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC) +{ + getObjectEx(http_message_object, obj, object); + http_message *msg = obj->message; + zval *return_value; + + if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { + zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); + return EG(uninitialized_zval_ptr); + } + + ALLOC_ZVAL(return_value); + return_value->refcount = 0; + +#if 0 + fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)), + zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1) + ); +#endif + + switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)) + { + case HTTP_MSG_PROPHASH_TYPE: + RETVAL_LONG(msg->type); + break; + + case HTTP_MSG_PROPHASH_HTTP_VERSION: + switch (msg->type) + { + case HTTP_MSG_NONE: + RETVAL_NULL(); + break; + + case HTTP_MSG_REQUEST: + RETVAL_DOUBLE(msg->info.request.http_version); + break; + + case HTTP_MSG_RESPONSE: + RETVAL_DOUBLE(msg->info.response.http_version); + break; + } + break; + + case HTTP_MSG_PROPHASH_RAW: + if (msg->raw) { + if (msg->len) { + RETVAL_STRINGL(msg->raw, msg->len, 1); + } else { + RETVAL_STRINGL(empty_string, 0, 0); + } + } else { + RETVAL_NULL(); + } + break; + + case HTTP_MSG_PROPHASH_BODY: + phpstr_fix(PHPSTR(msg)); + RETVAL_PHPSTR(PHPSTR(msg), 0, 1); + break; + + case HTTP_MSG_PROPHASH_HEADERS: + Z_TYPE_P(return_value) = IS_ARRAY; + Z_ARRVAL_P(return_value) = &msg->hdrs; + break; + + case HTTP_MSG_PROPHASH_NESTED_MESSAGE: + RETVAL_NULL(); + break; + + case HTTP_MSG_PROPHASH_REQUEST_METHOD: + if (msg->type == HTTP_MSG_REQUEST && msg->info.request.method) { + RETVAL_STRING(msg->info.request.method, 1); + } else { + RETVAL_NULL(); + } + break; + + case HTTP_MSG_PROPHASH_REQUEST_URI: + if (msg->type == HTTP_MSG_REQUEST && msg->info.request.URI) { + RETVAL_STRING(msg->info.request.URI, 1); + } else { + RETVAL_NULL(); + } + break; + + case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + if (msg->type == HTTP_MSG_RESPONSE) { + RETVAL_LONG(msg->info.response.status); + } else { + RETVAL_NULL(); + } + break; + + default: + RETVAL_NULL(); + break; + } + + return return_value; +} + +#define http_message_object_write_prop _http_message_object_write_prop +static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC) +{ + getObjectEx(http_message_object, obj, object); + http_message *msg = obj->message; + + if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { + zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); + } + +#if 0 + fprintf(stderr, "Writing property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)), + zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1) + ); +#endif + + switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)) + { + case HTTP_MSG_PROPHASH_TYPE: + msg->type = Z_LVAL_P(value); + break; + + case HTTP_MSG_PROPHASH_HTTP_VERSION: + switch (msg->type) + { + case HTTP_MSG_REQUEST: + msg->info.request.http_version = (float) Z_DVAL_P(value); + break; + + case HTTP_MSG_RESPONSE: + msg->info.response.http_version = (float) Z_DVAL_P(value); + break; + } + break; + + case HTTP_MSG_PROPHASH_RAW: + http_message_dtor(msg); + http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1); + break; + + case HTTP_MSG_PROPHASH_BODY: + phpstr_dtor(PHPSTR(msg)); + phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value)); + break; + + case HTTP_MSG_PROPHASH_HEADERS: + zend_hash_clean(&msg->hdrs); + zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + break; + + case HTTP_MSG_PROPHASH_NESTED_MESSAGE: + break; + + case HTTP_MSG_PROPHASH_REQUEST_METHOD: + if (msg->type == HTTP_MSG_REQUEST) { + if (msg->info.request.method) { + efree(msg->info.request.method); + } + msg->info.request.method = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); + } + break; + + case HTTP_MSG_PROPHASH_REQUEST_URI: + if (msg->type == HTTP_MSG_REQUEST) { + if (msg->info.request.URI) { + efree(msg->info.request.URI); + } + msg->info.request.URI = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); + } + break; + + case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + if (msg->type == HTTP_MSG_RESPONSE) { + msg->info.response.status = Z_LVAL_P(value); + } + break; + } +} -/* {{{ HTTPi_Response */ +#define http_message_object_get_props _http_message_object_get_props +static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) +{ + zval *headers; + getObjectEx(http_message_object, obj, object); + http_message *msg = obj->message; + +#define ASSOC_PROP(obj, ptype, name, val) \ + { \ + zval array; \ + char *m_prop_name; \ + int m_prop_len; \ + Z_ARRVAL(array) = OBJ_PROP(obj); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ + add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \ + } +#define ASSOC_STRING(obj, name, val) ASSOC_STRINGL(obj, name, val, strlen(val)) +#define ASSOC_STRINGL(obj, name, val, len) \ + { \ + zval array; \ + char *m_prop_name; \ + int m_prop_len; \ + Z_ARRVAL(array) = OBJ_PROP(obj); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ + add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, val != empty_string); \ + } -zend_class_entry *httpi_response_ce; -static zend_object_handlers httpi_response_object_handlers; + zend_hash_clean(OBJ_PROP(obj)); + + ASSOC_PROP(obj, long, "type", msg->type); + ASSOC_STRINGL(obj, "raw", msg->raw, msg->len) + ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); + + MAKE_STD_ZVAL(headers); + array_init(headers); + + zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + ASSOC_PROP(obj, zval, "headers", headers); + + switch (msg->type) + { + case HTTP_MSG_REQUEST: + ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version); + ASSOC_PROP(obj, long, "responseStatus", 0); + ASSOC_STRING(obj, "requestMethod", msg->info.request.method); + ASSOC_STRING(obj, "requestUri", msg->info.request.URI); + break; + + case HTTP_MSG_RESPONSE: + ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version); + ASSOC_PROP(obj, long, "responseStatus", msg->info.response.status); + ASSOC_STRING(obj, "requestMethod", empty_string); + ASSOC_STRING(obj, "requestUri", empty_string); + break; + + case HTTP_MSG_NONE: + default: + ASSOC_PROP(obj, double, "httpVersion", 0.0); + ASSOC_PROP(obj, long, "responseStatus", 0); + ASSOC_STRING(obj, "requestMethod", empty_string); + ASSOC_STRING(obj, "requestUri", empty_string); + break; + } + + return OBJ_PROP(obj); +} -#define httpi_response_declare_default_properties(ce) _httpi_response_declare_default_properties(ce TSRMLS_CC) -static inline void _httpi_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC) +#define http_message_global_init() _http_message_global_init(TSRMLS_C) +static inline void _http_message_global_init(TSRMLS_D) +{ + http_message_object_handlers.read_property = http_message_object_read_prop; + http_message_object_handlers.write_property = http_message_object_write_prop; + http_message_object_handlers.get_properties = http_message_object_get_props; +} + +#define http_message_declare_default_properties(ce) _http_message_declare_default_properties(ce TSRMLS_CC) +static inline void _http_message_declare_default_properties(zend_class_entry *ce TSRMLS_DC) +{ + DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); + + DCL_PROP(PROTECTED, string, raw, ""); + DCL_PROP(PROTECTED, string, body, ""); + + DCL_PROP(PROTECTED, string, requestMethod, ""); + DCL_PROP(PROTECTED, string, requestUri, ""); + DCL_PROP(PROTECTED, long, responseStatus, 0); + + DCL_PROP_N(PROTECTED, httpVersion); + DCL_PROP_N(PROTECTED, headers); + DCL_PROP_N(PROTECTED, nestedMessage); +} + +#define http_message_free_object _http_message_free_object +void _http_message_free_object(zend_object *object TSRMLS_DC) +{ + http_message_object *o = (http_message_object *) object; + + if (OBJ_PROP(o)) { + zend_hash_destroy(OBJ_PROP(o)); + FREE_HASHTABLE(OBJ_PROP(o)); + } + if (o->message) { + http_message_free(o->message); + } + efree(o); +} + +#define http_message_new_object _http_message_new_object +zend_object_value _http_message_new_object(zend_class_entry *ce TSRMLS_DC) +{ + zend_object_value ov; + http_message_object *o; + + o = ecalloc(1, sizeof(http_message_object)); + o->zo.ce = ce; + o->message = http_message_new(); + + ALLOC_HASHTABLE(OBJ_PROP(o)); + zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + + ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_message_free_object, NULL TSRMLS_CC); + ov.handlers = &http_message_object_handlers; + + return ov; +} + +zend_function_entry http_message_class_methods[] = { + PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpMessage, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) + {NULL, NULL, NULL} +}; +/* }}} */ + +/* {{{ 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, ""); @@ -178,10 +511,10 @@ static inline void _httpi_response_declare_default_properties(zend_class_entry * DCL_PROP(PRIVATE, long, send_mode, -1); } -#define httpi_response_destroy_object _httpi_response_destroy_object -void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) +#define http_response_destroy_object _http_response_destroy_object +void _http_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) { - httpi_response_object *o = object; + http_response_object *o = object; if (OBJ_PROP(o)) { zend_hash_destroy(OBJ_PROP(o)); FREE_HASHTABLE(OBJ_PROP(o)); @@ -189,70 +522,70 @@ void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRM efree(o); } -#define httpi_response_new_object _httpi_response_new_object -zend_object_value _httpi_response_new_object(zend_class_entry *ce TSRMLS_DC) +#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; - httpi_response_object *o; + http_response_object *o; - o = ecalloc(1, sizeof(httpi_response_object)); + 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, httpi_response_destroy_object, NULL, NULL TSRMLS_CC); - ov.handlers = &httpi_response_object_handlers; + 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 httpi_response_class_methods[] = { - PHP_ME(HTTPi_Response, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -/* PHP_ME(HTTPi_Response, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) +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(HTTPi_Response, setETag, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getETag, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setETag, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getETag, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setContentDisposition, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getContentDisposition, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setContentDisposition, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getContentDisposition, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setCache, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getCache, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setCache, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getCache, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setCacheControl, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getCacheControl, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setCacheControl, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getCacheControl, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setGzip, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getGzip, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setGzip, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getGzip, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setFile, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getFile, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, setStream, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, getStream, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, setStream, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, getStream, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpResponse, send, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; /* }}} */ -/* {{{ HTTPi_Request */ +/* {{{ HttpRequest */ #ifdef HTTP_HAVE_CURL -zend_class_entry *httpi_request_ce; -static zend_object_handlers httpi_request_object_handlers; +zend_class_entry *http_request_ce; +static zend_object_handlers http_request_object_handlers; -#define httpi_request_declare_default_properties(ce) _httpi_request_declare_default_properties(ce TSRMLS_CC) -static inline void _httpi_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC) +#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); @@ -268,10 +601,10 @@ static inline void _httpi_request_declare_default_properties(zend_class_entry *c DCL_PROP(PROTECTED, string, postData, ""); } -#define httpi_request_free_object _httpi_request_free_object -void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC) +#define http_request_free_object _http_request_free_object +void _http_request_free_object(zend_object /* void */ *object TSRMLS_DC) { - httpi_request_object *o = (httpi_request_object *) object; + http_request_object *o = (http_request_object *) object; if (OBJ_PROP(o)) { zend_hash_destroy(OBJ_PROP(o)); @@ -284,13 +617,13 @@ void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC) efree(o); } -#define httpi_request_new_object _httpi_request_new_object -zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC) +#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; - httpi_request_object *o; + http_request_object *o; - o = ecalloc(1, sizeof(httpi_request_object)); + o = ecalloc(1, sizeof(http_request_object)); o->zo.ce = ce; o->ch = curl_easy_init(); @@ -298,49 +631,61 @@ zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC) 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, httpi_request_free_object, NULL TSRMLS_CC); - ov.handlers = &httpi_request_object_handlers; + 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 httpi_request_class_methods[] = { - PHP_ME(HTTPi_Request, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_ME(HTTPi_Request, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) +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(HTTPi_Request, setOptions, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getOptions, NULL, ZEND_ACC_PUBLIC) + 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, setSslOptions, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getSslOptions, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, unsetSslOptions, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, setMethod, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getMethod, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, addHeaders, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getHeaders, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, unsetHeaders, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, addCookies, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getCookies, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, unsetCookies, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, setURL, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getURL, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setMethod, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getMethod, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, setContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setURL, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getURL, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, setQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, addQueryData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, unsetQueryData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, setContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequest, getContentType, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, setPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, addPostData, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, unsetPostData, 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(HTTPi_Request, addPostFile, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, getPostFiles, NULL, ZEND_ACC_PUBLIC) - PHP_ME(HTTPi_Request, unsetPostFiles, 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(HTTPi_Request, send, 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(HTTPi_Request, getResponseData, 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_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, getResponseCookie, 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} }; @@ -363,7 +708,7 @@ zend_module_entry http_module_entry = { PHP_RSHUTDOWN(http), PHP_MINFO(http), #if ZEND_MODULE_API_NO >= 20010901 - PHP_EXT_HTTP_VERSION, + HTTP_PEXT_VERSION, #endif STANDARD_MODULE_PROPERTIES }; @@ -383,10 +728,10 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->etag = NULL; http_globals->lmod = 0; #ifdef HTTP_HAVE_CURL - http_globals->curlbuf.data = NULL; - http_globals->curlbuf.used = 0; - http_globals->curlbuf.free = 0; - http_globals->curlbuf.size = 0; + 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; @@ -416,33 +761,71 @@ PHP_INI_MH(update_allowed_methods) } PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("http.allowed_methods", - "OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK", + 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() /* }}} */ +/* {{{ HTTP_CURL_USE_ZEND_MM */ +#if defined(HTTP_HAVE_CURL) && defined(HTTP_CURL_USE_ZEND_MM) +static void http_curl_free(void *p) { efree(p); } +static char *http_curl_strdup(const char *p) { return estrdup(p); } +static void *http_curl_malloc(size_t s) { return emalloc(s); } +static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); } +static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); } +#endif /* HTTP_HAVE_CURL && HTTP_CURL_USE_ZEND_MM */ +/* }}} */ + /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); REGISTER_INI_ENTRIES(); -#if defined(HTTP_HAVE_CURL) && (LIBCURL_VERSION_NUM >= 0x070a05) +#ifdef HTTP_HAVE_CURL +# ifdef HTTP_CURL_USE_ZEND_MM + if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL, + http_curl_malloc, + http_curl_free, + http_curl_realloc, + http_curl_strdup, + http_curl_calloc)) { + 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 +# endif /* LIBCURL_VERSION_NUM */ +#endif /* HTTP_HAVE_CURL */ #ifdef ZEND_ENGINE_2 - HTTP_REGISTER_CLASS(HTTPi, httpi, NULL, ZEND_ACC_FINAL_CLASS); - HTTP_REGISTER_CLASS_EX(HTTPi_Response, httpi_response, NULL, 0); + HTTP_REGISTER_CLASS(HttpUtil, http_util, NULL, ZEND_ACC_FINAL_CLASS); + HTTP_REGISTER_CLASS_EX(HttpMessage, http_message, NULL, 0); + HTTP_REGISTER_CLASS_EX(HttpResponse, http_response, NULL, 0); # ifdef HTTP_HAVE_CURL - HTTP_REGISTER_CLASS_EX(HTTPi_Request, httpi_request, NULL, 0); + 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); # endif /* HTTP_HAVE_CURL */ + + http_message_global_init(); + #endif /* ZEND_ENGINE_2 */ return SUCCESS; } @@ -452,6 +835,10 @@ PHP_MINIT_FUNCTION(http) PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); +#ifdef HTTP_HAVE_CURL + phpstr_dtor(&HTTP_G(curlbuf)); + curl_global_cleanup(); +#endif return SUCCESS; } /* }}} */ @@ -482,12 +869,10 @@ PHP_RSHUTDOWN_FUNCTION(http) } #ifdef HTTP_HAVE_CURL - if (HTTP_G(curlbuf).data) { - efree(HTTP_G(curlbuf).data); - HTTP_G(curlbuf).data = NULL; - HTTP_G(curlbuf).used = 0; - HTTP_G(curlbuf).free = 0; - } +# if LIBCURL_VERSION_NUM < 0x070c00 + memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr))); +# endif + phpstr_dtor(&HTTP_G(curlbuf)); #endif return SUCCESS; @@ -497,16 +882,37 @@ PHP_RSHUTDOWN_FUNCTION(http) /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(http) { - php_info_print_table_start(); - php_info_print_table_header(2, "Extended HTTP support", "enabled"); - php_info_print_table_row(2, "Version:", PHP_EXT_HTTP_VERSION); - php_info_print_table_row(2, "cURL convenience functions:", +#ifdef ZEND_ENGINE_2 +# define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")" +#else +# define HTTP_FUNC_AVAIL(CLASS) "procedural" +#endif + #ifdef HTTP_HAVE_CURL - "enabled" +# define HTTP_CURL_VERSION curl_version() +# ifdef ZEND_ENGINE_2 +# define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (class " CLASS ")" +# else +# define HTTP_CURL_AVAIL(CLASS) "procedural" +# endif #else - "disabled" +# define HTTP_CURL_VERSION "libcurl not available" +# define HTTP_CURL_AVAIL(CLASS) "libcurl not available" #endif - ); + + char full_version_string[1024] = {0}; + snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION); + + php_info_print_table_start(); + php_info_print_table_row(2, "Extended HTTP support", "enabled"); + php_info_print_table_row(2, "Extension Version:", full_version_string); + php_info_print_table_end(); + + 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, "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(); DISPLAY_INI_ENTRIES();