HashTable cache;
struct curl_slist *headers;
+ struct curl_slist *resolve;
php_http_buffer_t cookies;
long redirects;
curl->progress.state.info = "not disconnected";
} else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
curl->progress.state.info = "disconnected";
+ } else if (php_memnstr(data, ZEND_STRL("Issue another request"), data + length)) {
+ curl->progress.state.info = "redirect";
}
php_http_request_progress_notify(&curl->progress TSRMLS_CC);
break;
return n*l;
}
-static STATUS php_http_curl_request_prepare(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body)
+static STATUS php_http_curl_request_prepare(php_http_request_t *h, const char *meth, const char *url, php_http_message_body_t *body)
{
php_http_curl_request_t *curl = h->ctx;
php_http_curl_request_storage_t *storage = get_storage(curl->handle);
curl_easy_setopt(curl->handle, CURLOPT_URL, storage->url);
/* request method */
- switch (meth) {
- case PHP_HTTP_GET:
+ switch (php_http_select_str(meth, 4, "GET", "HEAD", "POST", "PUT")) {
+ case 0:
curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1L);
break;
- case PHP_HTTP_HEAD:
+ case 1:
curl_easy_setopt(curl->handle, CURLOPT_NOBODY, 1L);
break;
- case PHP_HTTP_POST:
+ case 2:
curl_easy_setopt(curl->handle, CURLOPT_POST, 1L);
break;
- case PHP_HTTP_PUT:
+ case 3:
curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L);
break;
default: {
- const char *name = php_http_request_method_name(meth TSRMLS_CC);
-
- if (name) {
- curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, name);
+ if (meth) {
+ curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, meth);
} else {
- php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", meth, url);
+ php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_METHOD, "Unsupported request method: '%s' (%s)", meth, url);
return FAILURE;
}
break;
* same semantics as those specified in section 9« reveal that not any single defined HTTP/1.1 method
* does not allow a request body.
*/
- switch (meth) {
- default: {
- size_t body_size = php_http_message_body_size(body);
-
- curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, body);
- curl_easy_setopt(curl->handle, CURLOPT_READDATA, body);
- curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
- curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
- break;
- }
- }
+ size_t body_size = php_http_message_body_size(body);
+
+ curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, body);
+ curl_easy_setopt(curl->handle, CURLOPT_READDATA, body);
+ curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
+ curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
}
return SUCCESS;
if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("ipresolve"), IS_LONG)) && Z_LVAL_P(zoption)) {
curl_easy_setopt(ch, CURLOPT_IPRESOLVE, Z_LVAL_P(zoption));
}
+#if PHP_HTTP_CURL_VERSION(7,21,3)
+ if (curl->options.resolve) {
+ curl_slist_free_all(curl->options.resolve);
+ curl->options.resolve = NULL;
+ }
+ if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("resolve"), IS_ARRAY))) {
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ HashPosition pos;
+ zval **data;
+
+ FOREACH_KEYVAL(pos, zoption, key, data) {
+ zval *cpy = php_http_ztyp(IS_STRING, *data);
+
+ curl->options.resolve = curl_slist_append(curl->options.resolve, Z_STRVAL_P(cpy));
+
+ zval_ptr_dtor(&cpy);
+ }
+ }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,24,0)
+ if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("dns_servers"), IS_STRING)) && Z_STRLEN_P(zoption)) {
+ curl_easy_setopt(ch, CURLOPT_DNS_SERVERS, Z_STRVAL_P(zoption));
+ }
+#endif
/* limits */
if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("low_speed_limit"), IS_LONG))) {
add_assoc_zval_ex(&array, "ssl_engines", sizeof("ssl_engines"), subarray);
curl_slist_free_all(s);
}
-#if PHP_HTTP_CURL_VERSION(7,14,1)
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_COOKIELIST, &s)) {
MAKE_STD_ZVAL(subarray);
array_init(subarray);
add_assoc_zval_ex(&array, "cookies", sizeof("cookies"), subarray);
curl_slist_free_all(s);
}
-#endif
-#if PHP_HTTP_CURL_VERSION(7,18,2)
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_URL, &c)) {
add_assoc_string_ex(&array, "redirect_url", sizeof("redirect_url"), c ? c : "", 1);
}
-#endif
#if PHP_HTTP_CURL_VERSION(7,19,0)
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_IP, &c)) {
add_assoc_string_ex(&array, "primary_ip", sizeof("primary_ip"), c ? c : "", 1);
add_assoc_long_ex(&array, "condition_unmet", sizeof("condition_unmet"), l);
}
#endif
+#if PHP_HTTP_CURL_VERSION(7,21,0)
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_PORT, &l)) {
+ add_assoc_long_ex(&array, "primary_port", sizeof("primary_port"), l);
+ }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,21,0)
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_IP, &c)) {
+ add_assoc_string_ex(&array, "local_ip", sizeof("local_ip"), c ? c : "", 1);
+ }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,21,0)
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_PORT, &l)) {
+ add_assoc_long_ex(&array, "local_port", sizeof("local_port"), l);
+ }
+#endif
+
/* END::CURLINFO */
+
#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
{
int i;
}
break;
+#if PHP_HTTP_CURL_VERSION(7,23,0)
+ case PHP_HTTP_REQUEST_DATASHARE_OPT_SSLSESSIONS:
+ if (CURLSHE_OK != (rc = curl_share_setopt(curl->handle, *((zend_bool *) arg) ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, CURL_LOCK_DATA_SSL_SESSION))) {
+ TSRMLS_FETCH_FROM_CTX(h->ts);
+
+ php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_DATASHARE, "Could not %s sharing of SSL session data: %s", *((zend_bool *) arg) ? "enable" : "disable", curl_share_strerror(rc));
+ return FAILURE;
+ }
+ break;
+#endif
+
default:
return FAILURE;
}
h->ctx = NULL;
}
-static STATUS php_http_curl_request_pool_attach(php_http_request_pool_t *h, php_http_request_t *r, php_http_request_method_t m, const char *url, php_http_message_body_t *body)
+static STATUS php_http_curl_request_pool_attach(php_http_request_pool_t *h, php_http_request_t *r, const char *m, const char *url, php_http_message_body_t *body)
{
php_http_curl_request_pool_t *curl = h->ctx;
php_http_curl_request_t *recurl = r->ctx;
curl_easy_setopt(ch, CURLOPT_HTTPPROXYTUNNEL, 0L);
curl_easy_setopt(ch, CURLOPT_DNS_CACHE_TIMEOUT, 60L);
curl_easy_setopt(ch, CURLOPT_IPRESOLVE, 0);
+#if PHP_HTTP_CURL_VERSION(7,21,3)
+ curl_easy_setopt(ch, CURLOPT_RESOLVE, NULL);
+#endif
+#if PHP_HTTP_CURL_VERSION(7,24,0)
+ curl_easy_setopt(ch, CURLOPT_DNS_SERVERS, NULL);
+#endif
curl_easy_setopt(ch, CURLOPT_LOW_SPEED_LIMIT, 0L);
curl_easy_setopt(ch, CURLOPT_LOW_SPEED_TIME, 0L);
/* LFS weirdance
return SUCCESS;
}
-static STATUS php_http_curl_request_exec(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body)
+static STATUS php_http_curl_request_exec(php_http_request_t *h, const char *meth, const char *url, php_http_message_body_t *body)
{
uint tries = 0;
CURLcode result;
projects / m6w6 / ext-http / blobdiff