X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_curl.c;h=4573df7e1ce7c1c76a1f04ce53b69f751898b3db;hp=15d26192cedfdc27dbeff17d8ec7ab23a3e5c7d2;hb=refs%2Fheads%2Fv2.1.x;hpb=d739650057f4ca2fc67f1ae2bfd1d24c3f2f9e7b diff --git a/php_http_client_curl.c b/php_http_client_curl.c index 15d2619..4573df7 100644 --- a/php_http_client_curl.c +++ b/php_http_client_curl.c @@ -49,6 +49,7 @@ typedef struct php_http_client_curl { int unfinished; /* int because of curl_multi_perform() */ #if PHP_HTTP_HAVE_EVENT + struct event_base *evbase; struct event *timeout; unsigned useevents:1; #endif @@ -98,6 +99,7 @@ typedef struct php_http_client_curl_handler { typedef struct php_http_curle_storage { char *url; char *cookiestore; + CURLcode errorcode; char errorbuffer[0x100]; } php_http_curle_storage_t; @@ -487,7 +489,6 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info) #if PHP_HTTP_CURL_VERSION(7,34,0) { - int i; zval *ti_array; struct curl_tlssessioninfo *ti; @@ -538,9 +539,11 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info) case CURLSSLBACKEND_NSS: backend = "nss"; break; +#if !PHP_HTTP_CURL_VERSION(7,39,0) case CURLSSLBACKEND_QSOSSL: backend = "qsossl"; break; +#endif case CURLSSLBACKEND_GSKIT: backend = "gskit"; break; @@ -599,7 +602,12 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info) } } #endif - add_assoc_string_ex(&array, "error", sizeof("error"), php_http_curle_get_storage(ch)->errorbuffer, 1); + { + php_http_curle_storage_t *st = php_http_curle_get_storage(ch); + + add_assoc_long_ex(&array, "curlcode", sizeof("curlcode"), st->errorcode); + add_assoc_string_ex(&array, "error", sizeof("error"), st->errorbuffer, 1); + } return SUCCESS; } @@ -622,7 +630,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context) if (msg && CURLMSG_DONE == msg->msg) { if (CURLE_OK != msg->data.result) { php_http_curle_storage_t *st = php_http_curle_get_storage(msg->easy_handle); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(st->errorcode = msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url)); } if ((enqueue = php_http_client_enqueued(context, msg->easy_handle, compare_queue))) { @@ -753,7 +761,7 @@ static int php_http_curlm_socket_callback(CURL *easy, curl_socket_t sock, int ac return -1; } - event_assign(&ev->evnt, PHP_HTTP_G->curl.event_base, sock, events, php_http_curlm_event_callback, context); + event_assign(&ev->evnt, curl->evbase, sock, events, php_http_curlm_event_callback, context); event_add(&ev->evnt, NULL); } @@ -774,10 +782,9 @@ static void php_http_curlm_timer_callback(CURLM *multi, long timeout_ms, void *t php_http_curlm_timeout_callback(CURL_SOCKET_TIMEOUT, /*EV_READ|EV_WRITE*/0, context); } else if (timeout_ms > 0 || !event_initialized(curl->timeout) || !event_pending(curl->timeout, EV_TIMEOUT, NULL)) { struct timeval timeout; - TSRMLS_FETCH_FROM_CTX(context->ts); if (!event_initialized(curl->timeout)) { - event_assign(curl->timeout, PHP_HTTP_G->curl.event_base, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context); + event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context); } else if (event_pending(curl->timeout, EV_TIMEOUT, NULL)) { event_del(curl->timeout); } @@ -1309,7 +1316,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } if ((opt = php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; - ZVAL_STRING(&opt->defval, "PEM", 1); + ZVAL_STRING(&opt->defval, "PEM", 0); } if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; @@ -1317,7 +1324,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } if ((opt = php_http_option_register(registry, ZEND_STRL("keytype"), CURLOPT_SSLKEYTYPE, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; - ZVAL_STRING(&opt->defval, "PEM", 1); + ZVAL_STRING(&opt->defval, "PEM", 0); } if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; @@ -1491,6 +1498,9 @@ static STATUS php_http_client_curl_handler_reset(php_http_client_curl_handler_t } curl_easy_setopt(ch, CURLOPT_URL, NULL); + curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, NULL); + curl_easy_setopt(ch, CURLOPT_HTTPGET, 1L); + curl_easy_setopt(ch, CURLOPT_NOBODY, 0L); /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */ #if PHP_HTTP_CURL_VERSION(7,19,1) curl_easy_setopt(ch, CURLOPT_PROXYUSERNAME, NULL); @@ -1626,15 +1636,25 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_ php_http_message_update_headers(msg); if (zend_hash_num_elements(&msg->hdrs)) { php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0); - zval **header_val; + zval **header_val, *header_cpy; HashPosition pos; php_http_buffer_t header; +#if !PHP_HTTP_CURL_VERSION(7,23,0) + zval **ct = NULL; + + zend_hash_find(&msg->hdrs, ZEND_STRS("Content-Length"), (void *) &ct); +#endif php_http_buffer_init(&header); FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) { if (header_key.type == HASH_KEY_IS_STRING) { - zval *header_cpy = php_http_ztyp(IS_STRING, *header_val); - +#if !PHP_HTTP_CURL_VERSION(7,23,0) + /* avoid duplicate content-length header */ + if (ct && *ct == *header_val) { + continue; + } +#endif + header_cpy = php_http_ztyp(IS_STRING, *header_val); php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy)); php_http_buffer_fix(&header); curl->options.headers = curl_slist_append(curl->options.headers, header.data); @@ -1672,10 +1692,8 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_ return SUCCESS; } -static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler) +static void php_http_client_curl_handler_clear(php_http_client_curl_handler_t *handler) { - TSRMLS_FETCH_FROM_CTX(handler->client->ts); - curl_easy_setopt(handler->handle, CURLOPT_NOPROGRESS, 1L); #if PHP_HTTP_CURL_VERSION(7,32,0) curl_easy_setopt(handler->handle, CURLOPT_XFERINFOFUNCTION, NULL); @@ -1684,6 +1702,13 @@ static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *ha #endif curl_easy_setopt(handler->handle, CURLOPT_VERBOSE, 0L); curl_easy_setopt(handler->handle, CURLOPT_DEBUGFUNCTION, NULL); +} + +static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler) +{ + TSRMLS_FETCH_FROM_CTX(handler->client->ts); + + php_http_client_curl_handler_clear(handler); php_resource_factory_handle_dtor(handler->rf, handler->handle TSRMLS_CC); php_resource_factory_free(&handler->rf); @@ -1731,9 +1756,16 @@ static void php_http_client_curl_dtor(php_http_client_t *h) #if PHP_HTTP_HAVE_EVENT if (curl->timeout) { + if (event_initialized(curl->timeout) && event_pending(curl->timeout, EV_TIMEOUT, NULL)) { + event_del(curl->timeout); + } efree(curl->timeout); curl->timeout = NULL; } + if (curl->evbase) { + event_base_free(curl->evbase); + curl->evbase = NULL; + } #endif curl->unfinished = 0; @@ -1841,6 +1873,7 @@ static STATUS php_http_client_curl_dequeue(php_http_client_t *h, php_http_client php_http_client_curl_handler_t *handler = enqueue->opaque; TSRMLS_FETCH_FROM_CTX(h->ts); + php_http_client_curl_handler_clear(handler); if (CURLM_OK == (rs = curl_multi_remove_handle(curl->handle, handler->handle))) { zend_llist_del_element(&h->requests, handler->handle, (int (*)(void *, void *)) compare_queue); return SUCCESS; @@ -1943,7 +1976,7 @@ static STATUS php_http_client_curl_exec(php_http_client_t *h) if (curl->useevents) { php_http_curlm_timeout_callback(CURL_SOCKET_TIMEOUT, /*EV_READ|EV_WRITE*/0, h); do { - int ev_rc = event_base_dispatch(PHP_HTTP_G->curl.event_base); + int ev_rc = event_base_dispatch(curl->evbase); #if DBG_EVENTS fprintf(stderr, "%c", "X.0"[ev_rc+1]); @@ -1987,6 +2020,9 @@ static STATUS php_http_client_curl_setopt(php_http_client_t *h, php_http_client_ case PHP_HTTP_CLIENT_OPT_USE_EVENTS: #if PHP_HTTP_HAVE_EVENT if ((curl->useevents = *((zend_bool *) arg))) { + if (!curl->evbase) { + curl->evbase = event_base_new(); + } if (!curl->timeout) { curl->timeout = ecalloc(1, sizeof(struct event)); } @@ -2096,6 +2132,11 @@ PHP_MINIT_FUNCTION(http_client_curl) * SSL Version Constants */ REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1, CONST_CS|CONST_PERSISTENT); +#if PHP_HTTP_CURL_VERSION(7,34,0) + REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_0", CURL_SSLVERSION_TLSv1_0, CONST_CS|CONST_PERSISTENT); + REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_1", CURL_SSLVERSION_TLSv1_1, CONST_CS|CONST_PERSISTENT); + REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_2", CURL_SSLVERSION_TLSv1_2, CONST_CS|CONST_PERSISTENT); +#endif REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT, CONST_CS|CONST_PERSISTENT); @@ -2117,6 +2158,9 @@ PHP_MINIT_FUNCTION(http_client_curl) #endif REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_NTLM", CURLAUTH_NTLM, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE, CONST_CS|CONST_PERSISTENT); +#if PHP_HTTP_CURL_VERSION(7,38,0) + REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_SPNEGO", CURLAUTH_NEGOTIATE, CONST_CS|CONST_PERSISTENT); +#endif REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_ANY", CURLAUTH_ANY, CONST_CS|CONST_PERSISTENT); /* @@ -2127,9 +2171,9 @@ PHP_MINIT_FUNCTION(http_client_curl) REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS5", CURLPROXY_SOCKS5, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_HTTP", CURLPROXY_HTTP, CONST_CS|CONST_PERSISTENT); -# if PHP_HTTP_CURL_VERSION(7,19,4) +#if PHP_HTTP_CURL_VERSION(7,19,4) REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_HTTP_1_0", CURLPROXY_HTTP_1_0, CONST_CS|CONST_PERSISTENT); -# endif +#endif /* * Post Redirection Constants @@ -2137,6 +2181,9 @@ PHP_MINIT_FUNCTION(http_client_curl) #if PHP_HTTP_CURL_VERSION(7,19,1) REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_301", CURL_REDIR_POST_301, CONST_CS|CONST_PERSISTENT); REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_302", CURL_REDIR_POST_302, CONST_CS|CONST_PERSISTENT); +#if PHP_HTTP_CURL_VERSION(7,26,0) + REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_303", CURL_REDIR_POST_303, CONST_CS|CONST_PERSISTENT); +#endif REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_ALL", CURL_REDIR_POST_ALL, CONST_CS|CONST_PERSISTENT); #endif @@ -2153,24 +2200,6 @@ PHP_MSHUTDOWN_FUNCTION(http_client_curl) return SUCCESS; } -#if PHP_HTTP_HAVE_EVENT -PHP_RINIT_FUNCTION(http_client_curl) -{ - if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_base_new())) { - return FAILURE; - } - return SUCCESS; -} -PHP_RSHUTDOWN_FUNCTION(http_client_curl) -{ - if (PHP_HTTP_G->curl.event_base) { - event_base_free(PHP_HTTP_G->curl.event_base); - PHP_HTTP_G->curl.event_base = NULL; - } - return SUCCESS; -} -#endif /* PHP_HTTP_HAVE_EVENT */ - #endif /* PHP_HTTP_HAVE_CURL */ /*