# include <event.h>
#endif
-#include <ext/spl/spl_iterators.h>
-
-
typedef struct php_http_curl_request {
CURL *handle;
#endif
} php_http_curl_request_pool_t;
-#ifdef ZTS
-typedef struct php_http_curl_request_datashare_lock {
- CURL *ch;
- MUTEX_T mx;
-} php_http_curl_request_datashare_lock_t;
-#endif
-
typedef struct php_http_curl_request_datashare {
CURLSH *handle;
-
-#ifdef ZTS
- php_http_curl_request_datashare_lock_t *locks;
-#endif
} php_http_curl_request_datashare_t;
#define PHP_HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
void *ch;
if ((ch = curl_easy_duphandle(handle))) {
+ curl_easy_reset(ch);
get_storage(ch);
return ch;
}
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_request_method_is(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;
case CURL_POLL_REMOVE:
efree(ev);
+ /* no break */
case CURL_POLL_NONE:
return 0;
}
-#ifdef ZTS
-static void *php_http_curl_request_datashare_locks_init(void)
-{
- int i;
- php_http_curl_request_datashare_lock_t *locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(*locks), 1);
-
- if (locks) {
- for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
- locks[i].mx = tsrm_mutex_alloc();
- }
- }
-
- return locks;
-}
-
-static void php_http_curl_request_datashare_locks_dtor(void *l)
-{
- int i;
- php_http_curl_request_datashare_lock_t *locks = l;
-
- for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
- tsrm_mutex_free(locks[i].mx);
- }
- pefree(locks, 1);
-}
-
-static void php_http_curl_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr)
-{
- php_http_curl_request_datashare_lock_t *locks = userptr;
-
- /* TSRM can't distinguish shared/exclusive locks */
- tsrm_mutex_lock(locks[data].mx);
- locks[data].ch = handle;
-}
-
-static void php_http_curl_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr)
-{
- php_http_curl_request_datashare_lock_t *locks = userptr;
-
- if (locks[data].ch == handle) {
- tsrm_mutex_unlock(locks[data].mx);
- }
-}
-#endif
-
-
-
/* request datashare handler ops */
static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_http_request_datashare_t *h, void *handle)
return NULL;
}
- curl = pecalloc(1, sizeof(*curl), h->persistent);
+ curl = ecalloc(1, sizeof(*curl));
curl->handle = handle;
-#ifdef ZTS
- if (h->persistent) {
- curl->locks = php_http_curl_request_datashare_locks_init();
- if (curl->locks) {
- curl_share_setopt(curl->handle, CURLSHOPT_LOCKFUNC, php_http_curl_request_datashare_lock_func);
- curl_share_setopt(curl->handle, CURLSHOPT_UNLOCKFUNC, php_http_curl_request_datashare_unlock_func);
- curl_share_setopt(curl->handle, CURLSHOPT_USERDATA, curl->locks);
- }
- }
-#endif
h->ctx = curl;
return h;
php_http_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
-#ifdef ZTS
- if (h->persistent) {
- php_http_curl_request_datashare_locks_dtor(curl->locks);
- }
-#endif
-
- pefree(curl, h->persistent);
+ efree(curl);
h->ctx = NULL;
}
break;
case PHP_HTTP_REQUEST_DATASHARE_OPT_RESOLVER:
- if (CURLSHE_OK != (rc = curl_share_setopt(curl->handle, *((zend_bool *) arg) ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, CURL_LOCK_DATA_COOKIE))) {
+ if (CURLSHE_OK != (rc = curl_share_setopt(curl->handle, *((zend_bool *) arg) ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, CURL_LOCK_DATA_DNS))) {
TSRMLS_FETCH_FROM_CTX(h->ts);
php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_DATASHARE, "Could not %s sharing of resolver data: %s", *((zend_bool *) arg) ? "enable" : "disable", curl_share_strerror(rc));
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;
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;