X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=6dc29b8cf5175de8268b8592da71a2c991ca1367;hp=87bfb65ce5a1187126f7c706d7bd945cac90f5c5;hb=c7b95b4b19bbde93d3f142c5653ad5b68229cfcd;hpb=6086d2a97b6959531650c886b10dc814ad2392f9 diff --git a/http_request_object.c b/http_request_object.c index 87bfb65..6dc29b8 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -220,9 +220,6 @@ HTTP_BEGIN_ARGS(methodExists, 1) HTTP_ARG_VAL(method, 0) HTTP_END_ARGS; -#define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C) -static inline void _http_request_object_declare_default_properties(TSRMLS_D); - #define OBJ_PROP_CE http_request_object_ce zend_class_entry *http_request_object_ce; zend_function_entry http_request_object_fe[] = { @@ -310,60 +307,6 @@ PHP_MINIT_FUNCTION(http_request_object) { HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0); http_request_object_handlers.clone_obj = _http_request_object_clone_obj; - return SUCCESS; -} - -zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) -{ - return http_request_object_new_ex(ce, NULL, NULL); -} - -zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC) -{ - zend_object_value ov; - http_request_object *o; - - o = ecalloc(1, sizeof(http_request_object)); - o->zo.ce = ce; - o->request = http_request_init_ex(NULL, ch, 0, NULL); - - if (ptr) { - *ptr = o; - } - - 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 = putObject(http_request_object, o); - ov.handlers = &http_request_object_handlers; - - return ov; -} - -zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) -{ - zend_object *old_zo; - zend_object_value new_ov; - http_request_object *new_obj; - getObject(http_request_object, old_obj); - - old_zo = zend_objects_get_address(this_ptr TSRMLS_CC); - new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj); - if (old_obj->request->ch) { - http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request); - } - - zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); - phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used); - phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used); - - return new_ov; -} - -static inline void _http_request_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_request_object_ce; DCL_PROP_N(PRIVATE, options); DCL_PROP_N(PRIVATE, postFields); @@ -386,7 +329,7 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) #ifndef WONKY /* * Request Method Constants - */ + */ /* HTTP/1.1 */ DCL_CONST(long, "METH_GET", HTTP_GET); DCL_CONST(long, "METH_HEAD", HTTP_HEAD); @@ -419,19 +362,80 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) /* WebDAV Access Control - RFC 3744 */ DCL_CONST(long, "METH_ACL", HTTP_ACL); - /* cURL HTTP protocol versions */ + /* + * HTTP Protocol Version Constants + */ DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0); DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1); DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); /* - * Auth Constants - */ + * Auth Constants + */ DCL_CONST(long, "AUTH_BASIC", CURLAUTH_BASIC); DCL_CONST(long, "AUTH_DIGEST", CURLAUTH_DIGEST); DCL_CONST(long, "AUTH_NTLM", CURLAUTH_NTLM); DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY); + + /* + * Proxy Type Constants + */ +# if HTTP_CURL_VERSION(7,15,2) + DCL_CONST(long, "PROXY_SOCKS4", CURLPROXY_SOCKS4); +# endif + DCL_CONST(long, "PROXY_SOCKS5", CURLPROXY_SOCKS5); + DCL_CONST(long, "PROXY_HTTP", CURLPROXY_HTTP); #endif /* WONKY */ + + return SUCCESS; +} + +zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) +{ + return http_request_object_new_ex(ce, NULL, NULL); +} + +zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC) +{ + zend_object_value ov; + http_request_object *o; + + o = ecalloc(1, sizeof(http_request_object)); + o->zo.ce = ce; + o->request = http_request_init_ex(NULL, ch, 0, NULL); + + if (ptr) { + *ptr = o; + } + + 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 = putObject(http_request_object, o); + ov.handlers = &http_request_object_handlers; + + return ov; +} + +zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) +{ + zend_object *old_zo; + zend_object_value new_ov; + http_request_object *new_obj; + getObject(http_request_object, old_obj); + + old_zo = zend_objects_get_address(this_ptr TSRMLS_CC); + new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj); + if (old_obj->request->ch) { + http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request); + } + + zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used); + phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used); + + return new_ov; } void _http_request_object_free(zend_object *object TSRMLS_DC) @@ -453,15 +457,32 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt if (Z_STRLEN_P(ctype)) { zval **headers, *opts = GET_PROP(options); - + if ( (Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) && (Z_TYPE_PP(headers) == IS_ARRAY)) { zval **ct_header; - + /* only override if not already set */ if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header))) { add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); + } else + /* or not a string, zero length string or a string of spaces */ + if ((Z_TYPE_PP(ct_header) != IS_STRING) || !Z_STRLEN_PP(ct_header)) { + add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); + } else { + int i, only_space = 1; + + /* check for spaces only */ + for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) { + if (!isspace(Z_STRVAL_PP(ct_header)[i])) { + only_space = 0; + break; + } + } + if (only_space) { + add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); + } } } else { zval *headers; @@ -679,11 +700,19 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this return ret; } -#define http_request_object_set_options_subr(key, ow) \ - _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow)) -static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite) +static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key) { - zval *old_opts, *new_opts, *opts = NULL, **entry; + if (hash_key->nKeyLength > 1) { + hash_key->h = zend_get_hash_value(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength); + } + return ZEND_HASH_APPLY_KEEP; +} + +#define http_request_object_set_options_subr(key, ow, pk) \ + _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow), (pk)) +static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite, int prettify_keys) +{ + zval *old_opts, *new_opts, *opts = NULL, **entry = NULL; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) { RETURN_FALSE; @@ -696,6 +725,9 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM array_copy(old_opts, new_opts); } + if (prettify_keys && opts) { + zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0); + } if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void **) &entry)) { if (overwrite) { zend_hash_clean(Z_ARRVAL_PP(entry)); @@ -868,7 +900,7 @@ PHP_METHOD(HttpRequest, getOptions) */ PHP_METHOD(HttpRequest, setSslOptions) { - http_request_object_set_options_subr("ssl", 1); + http_request_object_set_options_subr("ssl", 1, 0); } /* }}} */ @@ -882,7 +914,7 @@ PHP_METHOD(HttpRequest, setSslOptions) */ PHP_METHOD(HttpRequest, addSslOptions) { - http_request_object_set_options_subr("ssl", 0); + http_request_object_set_options_subr("ssl", 0, 0); } /* }}} */ @@ -909,7 +941,7 @@ PHP_METHOD(HttpRequest, getSslOptions) */ PHP_METHOD(HttpRequest, addHeaders) { - http_request_object_set_options_subr("headers", 0); + http_request_object_set_options_subr("headers", 0, 1); } /* {{{ proto bool HttpRequest::setHeaders([array headers]) @@ -923,7 +955,7 @@ PHP_METHOD(HttpRequest, addHeaders) */ PHP_METHOD(HttpRequest, setHeaders) { - http_request_object_set_options_subr("headers", 1); + http_request_object_set_options_subr("headers", 1, 1); } /* }}} */ @@ -950,7 +982,7 @@ PHP_METHOD(HttpRequest, getHeaders) */ PHP_METHOD(HttpRequest, setCookies) { - http_request_object_set_options_subr("cookies", 1); + http_request_object_set_options_subr("cookies", 1, 0); } /* }}} */ @@ -965,7 +997,7 @@ PHP_METHOD(HttpRequest, setCookies) */ PHP_METHOD(HttpRequest, addCookies) { - http_request_object_set_options_subr("cookies", 0); + http_request_object_set_options_subr("cookies", 0, 0); } /* }}} */ @@ -1076,7 +1108,9 @@ PHP_METHOD(HttpRequest, setContentType) RETURN_FALSE; } - HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); + if (ct_len) { + HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); + } UPD_STRL(contentType, ctype, ct_len); RETURN_TRUE; } @@ -1535,8 +1569,6 @@ PHP_METHOD(HttpRequest, addPutData) } if (data_len) { - char *new_data; - size_t new_data_len; zval *data = GET_PROP(putData); if (Z_STRLEN_P(data)) {