#endif
/* }}} */
+/* safe curl wrappers */
+#define init_curl_storage(ch) \
+ {\
+ http_request_storage *st = pecalloc(1, sizeof(http_request_storage), 1); \
+ curl_easy_setopt(ch, CURLOPT_PRIVATE, st); \
+ curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, st->errorbuffer); \
+ }
+
+static void *safe_curl_init(void)
+{
+ CURL *ch;
+
+ if ((ch = curl_easy_init())) {
+ init_curl_storage(ch);
+ return ch;
+ }
+ return NULL;
+}
+static void *safe_curl_copy(void *p)
+{
+ CURL *ch;
+
+ if ((ch = curl_easy_duphandle(p))) {
+ init_curl_storage(ch);
+ return ch;
+ }
+ return NULL;
+}
+static void safe_curl_dtor(void *p) {
+ http_request_storage *st = http_request_storage_get(p);
+
+ curl_easy_cleanup(p);
+
+ if (st) {
+ if (st->url) {
+ pefree(st->url, 1);
+ }
+ if (st->cookiestore) {
+ pefree(st->cookiestore, 1);
+ }
+ pefree(st, 1);
+ }
+}
+/* }}} */
+
/* {{{ MINIT */
PHP_MINIT_FUNCTION(http_request)
{
return FAILURE;
}
- if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup, curl_easy_duphandle)) {
+ if (SUCCESS != http_persistent_handle_provide("http_request", safe_curl_init, safe_curl_dtor, safe_curl_copy)) {
return FAILURE;
}
/* set context */
if (request) {
- curl_easy_setopt(ch, CURLOPT_PRIVATE, request);
curl_easy_setopt(ch, CURLOPT_DEBUGDATA, request);
- curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, request->_error);
/* attach curl handle */
request->ch = ch;
phpstr_dtor(&request->conv.request);
phpstr_dtor(&request->conv.response);
http_request_body_dtor(request->body);
+ http_request_defaults(request);
if (request->ch) {
- http_request_defaults(request);
+ http_request_storage *st = http_request_storage_get(request->ch);
+
+ if (st) {
+ if (st->url) {
+ pefree(st->url, 1);
+ st->url = NULL;
+ }
+ if (st->cookiestore) {
+ pefree(st->cookiestore, 1);
+ st->cookiestore = NULL;
+ }
+ st->errorbuffer[0] = '\0';
+ }
}
- request->_error[0] = '\0';
}
/* }}} */
HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L);
HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L);
#if HTTP_CURL_VERSION(7,15,5)
+ /* LFS weirdance
HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0);
HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0);
+ */
#endif
/* crashes
HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */
{
zval *zoption;
zend_bool range_req = 0;
+ http_request_storage *storage;
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
+ if (!(storage = http_request_storage_get(request->ch))) {
+ return FAILURE;
+ }
+
/* set options */
- HTTP_CURL_OPT(CURLOPT_URL, request->url);
+ if (storage->url) {
+ pefree(storage->url, 1);
+ }
+ storage->url = pestrdup(request->url, 1);
+ HTTP_CURL_OPT(CURLOPT_URL, storage->url);
/* progress callback */
if ((zoption = http_request_option(request, options, "onprogress", -1))) {
/* proxy */
if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
- if (Z_STRLEN_P(zoption)) {
- HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
- }
+ HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
/* type */
if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));
HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
}
#if HTTP_CURL_VERSION(7,15,5)
+ /* LSF weirdance
if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
}
if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
}
+ */
#endif
/* crashes
if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
}
}
+
+ /* retries, defaults to 0 */
+ if ((zoption = http_request_option(request, options, "retrycount", IS_LONG))) {
+ request->_retry.count = Z_LVAL_P(zoption);
+ if ((zoption = http_request_option(request, options, "retrydelay", IS_DOUBLE))) {
+ request->_retry.delay = Z_DVAL_P(zoption);
+ } else {
+ request->_retry.delay = 0;
+ }
+ } else {
+ request->_retry.count = 0;
+ }
/* referer */
if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) {
if (Z_STRLEN_P(zoption)) {
HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE);
}
- HTTP_CURL_OPT(CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
- HTTP_CURL_OPT(CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
+ if (storage->cookiestore) {
+ pefree(storage->cookiestore, 1);
+ }
+ storage->cookiestore = pestrndup(Z_STRVAL_P(zoption), Z_STRLEN_P(zoption), 1);
+ HTTP_CURL_OPT(CURLOPT_COOKIEFILE, storage->cookiestore);
+ HTTP_CURL_OPT(CURLOPT_COOKIEJAR, storage->cookiestore);
}
/* maxfilesize */
/* {{{ void http_request_exec(http_request *) */
PHP_HTTP_API void _http_request_exec(http_request *request)
{
+ uint tries = 0;
CURLcode result;
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+retry:
if (CURLE_OK != (result = curl_easy_perform(request->ch))) {
- http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), request->_error, request->url);
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), http_request_storage_get(request->ch)->errorbuffer, request->url);
+
+ if (request->_retry.count > tries++) {
+ switch (result) {
+ case CURLE_COULDNT_RESOLVE_PROXY:
+ case CURLE_COULDNT_RESOLVE_HOST:
+ case CURLE_COULDNT_CONNECT:
+ case CURLE_WRITE_ERROR:
+ case CURLE_READ_ERROR:
+ case CURLE_OPERATION_TIMEDOUT:
+ case CURLE_SSL_CONNECT_ERROR:
+ case CURLE_GOT_NOTHING:
+ case CURLE_SSL_ENGINE_SETFAILED:
+ case CURLE_SEND_ERROR:
+ case CURLE_RECV_ERROR:
+ case CURLE_SSL_ENGINE_INITFAILED:
+ case CURLE_LOGIN_DENIED:
+ if (request->_retry.delay >= HTTP_DIFFSEC) {
+ http_sleep(request->_retry.delay);
+ }
+ goto retry;
+ default:
+ break;
+ }
+ }
}
}
/* }}} */
projects / m6w6 / ext-http / blobdiff