HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0);
HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1);
+#if HTTP_CURL_VERSION(7,15,2)
+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4);
+#endif
+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5", CURLPROXY_SOCKS5);
+ HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP", CURLPROXY_HTTP);
return SUCCESS;
}
/* }}} */
#define HTTP_CURL_OPT(OPTION, p) HTTP_CURL_OPT_EX(request->ch, OPTION, (p))
#define HTTP_CURL_OPT_EX(ch, OPTION, p) curl_easy_setopt((ch), OPTION, (p))
-#define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc)
+
+#define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
+ { \
+ char *K = #OPTION; \
+ HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \
+ }
#define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
- if (!strcasecmp(key, #keyname)) { \
- zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_STRING, *param)); \
+ if (!strcasecmp(key, keyname)) { \
+ zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_STRING, *param)); \
if (obdc) { \
HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
} \
key = NULL; \
continue; \
}
-#define HTTP_CURL_OPT_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, keyname)
+#define HTTP_CURL_OPT_LONG(OPTION, ldiff) \
+ { \
+ char *K = #OPTION; \
+ HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \
+ }
#define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
- if (!strcasecmp(key, #keyname)) { \
- zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_LONG, *param)); \
+ if (!strcasecmp(key, keyname)) { \
+ zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_LONG, *param)); \
HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
key = NULL; \
continue; \
if (request->ch) {
http_request_defaults(request);
}
+ request->_error[0] = '\0';
}
/* }}} */
HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1);
HTTP_CURL_OPT(CURLOPT_PROXY, NULL);
HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0);
+ HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0);
HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0);
HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
HTTP_CURL_OPT(CURLOPT_PORT, 0);
+#if HTTP_CURL_VERSION(7,15,2)
+ HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0);
+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0);
+#endif
HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0);
HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
#endif
HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL);
+ HTTP_CURL_OPT(CURLOPT_RANGE, NULL);
HTTP_CURL_OPT(CURLOPT_RESUME_FROM, 0);
HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, 0);
HTTP_CURL_OPT(CURLOPT_TIMECONDITION, 0);
if (Z_STRLEN_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));
+ }
/* port */
if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
/* outgoing interface */
if ((zoption = http_request_option(request, options, "interface", IS_STRING))) {
HTTP_CURL_OPT(CURLOPT_INTERFACE, Z_STRVAL_P(zoption));
+
+#if HTTP_CURL_VERSION(7,15,2)
+ if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) {
+ zval *prs, *pre;
+
+ zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &prs)) {
+ zend_hash_move_forward(Z_ARRVAL_P(zoption));
+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &pre)) {
+ zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre);
+
+ if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
+ HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, ABS(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
+ }
+ zval_free(&prs_cpy);
+ zval_free(&pre_cpy);
+ }
+ }
+ }
+#endif
}
/* another port */
range_req = 1;
HTTP_CURL_OPT(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
}
+ /* or range of kind array(array(0,499), array(100,1499)) */
+ else if ((zoption = http_request_option(request, options, "range", IS_ARRAY)) && zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
+ HashPosition pos1, pos2;
+ zval **rr, **rb, **re;
+ phpstr rs;
+
+ phpstr_init(&rs);
+ FOREACH_VAL(pos1, zoption, rr) {
+ if (Z_TYPE_PP(rr) == IS_ARRAY) {
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(rr), &pos2);
+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void **) &rb, &pos2)) {
+ zend_hash_move_forward_ex(Z_ARRVAL_PP(rr), &pos2);
+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void **) &re, &pos2)) {
+ if ( ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
+ ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
+ zval *rbl = zval_copy(IS_LONG, *rb), *rel = zval_copy(IS_LONG, *re);
+
+ if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) {
+ phpstr_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel));
+ }
+ zval_free(&rbl);
+ zval_free(&rel);
+ }
+ }
+ }
+ }
+ }
+
+ if (PHPSTR_LEN(&rs)) {
+ zval *cached_range;
+
+ /* ditch last comma */
+ PHPSTR_VAL(&rs)[PHPSTR_LEN(&rs)-- -1] = '\0';
+ /* cache string */
+ MAKE_STD_ZVAL(cached_range);
+ ZVAL_STRINGL(cached_range, PHPSTR_VAL(&rs), PHPSTR_LEN(&rs), 0);
+ HTTP_CURL_OPT(CURLOPT_RANGE, Z_STRVAL_P(http_request_option_cache(request, "range", cached_range)));
+ zval_ptr_dtor(&cached_range);
+ }
+ }
/* additional headers, array('name' => 'value') */
if (request->_cache.headers) {
if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
phpstr_dtor(&request->_cache.cookies);
if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
- if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
+ zval *urlenc_cookies = NULL;
+ /* check whether cookies should not be urlencoded; default is to urlencode them */
+ if ((!(urlenc_cookies = http_request_option(request, options, "encodecookies", IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) {
+ if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", lenof("; "), NULL, 0)) {
+ phpstr_fix(&request->_cache.cookies);
+ HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data);
+ }
+ } else {
+ HashPosition pos;
+ char *cookie_key = NULL;
+ ulong cookie_idx;
+
+ FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
+ if (cookie_key) {
+ zval **cookie_val;
+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
+ zval *val = zval_copy(IS_STRING, *cookie_val);
+ phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
+ zval_free(&val);
+ }
+
+ /* reset */
+ cookie_key = NULL;
+ }
+ }
+
phpstr_fix(&request->_cache.cookies);
- HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data);
+ if (PHPSTR_LEN(&request->_cache.cookies)) {
+ HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies));
+ }
}
}
}
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
/* reset cookies */
if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
HTTP_CURL_OPT(CURLOPT_COOKIELIST, "ALL");
HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
}
- /* connecttimeout, defaults to 3 */
+ /* connecttimeout, defaults to 0 */
if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
}
FOREACH_KEYVAL(pos, zoption, key, idx, param) {
if (key) {
- HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 1);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 0, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0, 0);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0, 0);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0, 0);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0);
- HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0);
+ HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0);
- HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER);
- HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST);
- HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 0);
+ HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER, 1);
+ HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 1, 0);
- HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, 1);
- HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, 1);
- HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, 1);
- HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, -3, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
+ HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
/* reset key */
key = NULL;
/* nothing */
break;
- case HTTP_REQUEST_BODY_CSTRING:
- HTTP_CURL_OPT(CURLOPT_POSTFIELDS, request->body->data);
- HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, request->body->size);
- break;
-
case HTTP_REQUEST_BODY_CURLPOST:
HTTP_CURL_OPT(CURLOPT_HTTPPOST, (struct curl_httppost *) request->body->data);
break;
+ case HTTP_REQUEST_BODY_CSTRING:
+ if (request->meth != HTTP_PUT) {
+ HTTP_CURL_OPT(CURLOPT_POSTFIELDS, request->body->data);
+ HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, request->body->size);
+ break;
+ }
+ /* fallthrough, PUT/UPLOAD _needs_ READDATA */
case HTTP_REQUEST_BODY_UPLOADFILE:
HTTP_CURL_OPT(CURLOPT_IOCTLDATA, request);
HTTP_CURL_OPT(CURLOPT_READDATA, request);
HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE);
HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL);
HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL);
- /*HTTP_CURL_INFO(OS_ERRNO);*/
HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS);
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");
#endif
+ HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
+ add_assoc_string(&array, "error", request->_error, 1);
}
/* }}} */
{
http_request *request = (http_request *) ctx;
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
-
- if (request->body == NULL || request->body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
- return 0;
+
+ if (request->body) {
+ switch (request->body->type)
+ {
+ case HTTP_REQUEST_BODY_CSTRING:
+ {
+ size_t out = MIN(len * n, request->body->size - request->body->priv);
+
+ if (out) {
+ memcpy(data, ((char *) request->body->data) + request->body->priv, out);
+ request->body->priv += out;
+ return out;
+ }
+ }
+ break;
+
+ case HTTP_REQUEST_BODY_UPLOADFILE:
+ return php_stream_read((php_stream *) request->body->data, data, len * n);
+ break;
+ }
}
- return php_stream_read((php_stream *) request->body->data, data, len * n);
+ return 0;
}
/* }}} */
if (cmd != CURLIOCMD_RESTARTREAD) {
return CURLIOE_UNKNOWNCMD;
}
- if ( request->body == NULL ||
- request->body->type != HTTP_REQUEST_BODY_UPLOADFILE ||
- SUCCESS != php_stream_rewind((php_stream *) request->body->data)) {
- return CURLIOE_FAILRESTART;
+
+ if (request->body) {
+ switch (request->body->type)
+ {
+ case HTTP_REQUEST_BODY_CSTRING:
+ request->body->priv = 0;
+ return CURLIOE_OK;
+ break;
+
+ case HTTP_REQUEST_BODY_UPLOADFILE:
+ if (SUCCESS == php_stream_rewind((php_stream *) request->body->data)) {
+ return CURLIOE_OK;
+ }
+ break;
+ }
}
- return CURLIOE_OK;
+
+ return CURLIOE_FAILRESTART;
}
/* }}} */