# include "php_http_request_object.h"
#endif
-/* {{{ cruft for thread safe SSL crypto locks */
-#if defined(ZTS) && defined(HTTP_HAVE_SSL)
-# ifdef PHP_WIN32
-# define HTTP_NEED_OPENSSL_TSL
-# include <openssl/crypto.h>
-# else /* !PHP_WIN32 */
-# if defined(HTTP_HAVE_OPENSSL)
-# if defined(HAVE_OPENSSL_CRYPTO_H)
-# define HTTP_NEED_OPENSSL_TSL
-# include <openssl/crypto.h>
-# else
-# warning \
- "libcurl was compiled with OpenSSL support, but configure could not find " \
- "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \
- "cause random crashes on SSL requests"
-# endif
-# elif defined(HTTP_HAVE_GNUTLS)
-# if defined(HAVE_GCRYPT_H)
-# define HTTP_NEED_GNUTLS_TSL
-# include <gcrypt.h>
-# else
-# warning \
- "libcurl was compiled with GnuTLS support, but configure could not find " \
- "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \
- "cause random crashes on SSL requests"
-# endif
-# else
-# warning \
- "libcurl was compiled with SSL support, but configure could not determine which" \
- "library was used; thus no SSL crypto locking callbacks will be set, which may " \
- "cause random crashes on SSL requests"
-# endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */
-# endif /* PHP_WIN32 */
-#endif /* ZTS && HTTP_HAVE_SSL */
+#include "php_http_request_int.h"
+/* {{{ cruft for thread safe SSL crypto locks */
#ifdef HTTP_NEED_OPENSSL_TSL
static MUTEX_T *http_openssl_tsl = NULL;
PHP_MINIT_FUNCTION(http_request)
{
#ifdef HTTP_NEED_OPENSSL_TSL
- int i, c = CRYPTO_num_locks();
-
- http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
-
- for (i = 0; i < c; ++i) {
- http_openssl_tsl[i] = tsrm_mutex_alloc();
+ /* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
+ if (!CRYPTO_get_id_callback()) {
+ int i, c = CRYPTO_num_locks();
+
+ http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+
+ for (i = 0; i < c; ++i) {
+ http_openssl_tsl[i] = tsrm_mutex_alloc();
+ }
+
+ CRYPTO_set_id_callback(http_openssl_thread_id);
+ CRYPTO_set_locking_callback(http_openssl_thread_lock);
}
-
- CRYPTO_set_id_callback(http_openssl_thread_id);
- CRYPTO_set_locking_callback(http_openssl_thread_lock);
#endif
#ifdef HTTP_NEED_GNUTLS_TSL
gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
+ HTTP_LONG_CONSTANT("HTTP_AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE);
HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
- HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE);
+ HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE); /* to be removed */
HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0);
HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1);
+ HTTP_LONG_CONSTANT("HTTP_VERSION_ANY", CURL_HTTP_VERSION_NONE);
+
+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1);
+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2);
+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3);
+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT);
+
+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_V4", CURL_IPRESOLVE_V4);
+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_V6", CURL_IPRESOLVE_V6);
+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_ANY", CURL_IPRESOLVE_WHATEVER);
#if HTTP_CURL_VERSION(7,15,2)
HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4);
/* {{{ MSHUTDOWN */
PHP_MSHUTDOWN_FUNCTION(http_request)
{
-#ifdef HTTP_NEED_OPENSSL_TSL
- CRYPTO_set_id_callback(http_openssl_thread_id);
- CRYPTO_set_locking_callback(http_openssl_thread_lock);
-#endif
curl_global_cleanup();
#ifdef HTTP_NEED_OPENSSL_TSL
if (http_openssl_tsl) {
}
/* }}} */
-/* {{{ MACROS */
-#ifndef HAVE_CURL_EASY_STRERROR
-# define curl_easy_strerror(dummy) "unknown error"
-#endif
-
-#define HTTP_CURL_INFO(I) \
- { \
- char *N = #I; \
- HTTP_CURL_INFO_EX(I, N+lenof("CURLINFO_")); \
- }
-#define HTTP_CURL_INFO_EX(I, X) \
- switch (I & ~CURLINFO_MASK) \
- { \
- case CURLINFO_STRING: \
- { \
- char *c; \
- if (CURLE_OK == curl_easy_getinfo(request->ch, I, &c)) { \
- char *key = estrndup(X, strlen(X)); \
- add_assoc_string(&array, pretty_key(key, strlen(X), 0, 0), c ? c : "", 1); \
- efree(key); \
- } \
- } \
- break; \
-\
- case CURLINFO_DOUBLE: \
- { \
- double d; \
- if (CURLE_OK == curl_easy_getinfo(request->ch, I, &d)) { \
- char *key = estrndup(X, strlen(X)); \
- add_assoc_double(&array, pretty_key(key, strlen(X), 0, 0), d); \
- efree(key); \
- } \
- } \
- break; \
-\
- case CURLINFO_LONG: \
- { \
- long l; \
- if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \
- char *key = estrndup(X, strlen(X)); \
- add_assoc_long(&array, pretty_key(key, strlen(X), 0, 0), l); \
- efree(key); \
- } \
- } \
- break; \
-\
- case CURLINFO_SLIST: \
- { \
- struct curl_slist *l, *p; \
- if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \
- zval *subarray; \
- char *key = estrndup(X, strlen(X)); \
- MAKE_STD_ZVAL(subarray); \
- array_init(subarray); \
- for (p = l; p; p = p->next) { \
- add_next_index_string(subarray, p->data, 1); \
- } \
- add_assoc_zval(&array, pretty_key(key, strlen(X), 0, 0), subarray); \
- curl_slist_free_all(l); \
- efree(key); \
- } \
- } \
- }
-
-#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(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_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_STRING, *param)); \
- if (obdc) { \
- HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
- } \
- HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \
- key = NULL; \
- continue; \
- }
-#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 = zval_copy(IS_LONG, *param); \
- HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
- key = NULL; \
- zval_free(©); \
- continue; \
- }
-/* }}} */
-
/* {{{ forward declarations */
#define http_request_option(r, o, k, t) _http_request_option_ex((r), (o), (k), sizeof(k), (t) TSRMLS_CC)
#define http_request_option_ex(r, o, k, l, t) _http_request_option_ex((r), (o), (k), (l), (t) TSRMLS_CC)
{
if (ch || (ch = curl_easy_init())) {
#if defined(ZTS)
- HTTP_CURL_OPT_EX(ch, CURLOPT_NOSIGNAL, 1L);
+ curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
#endif
- HTTP_CURL_OPT_EX(ch, CURLOPT_HEADER, 0L);
- HTTP_CURL_OPT_EX(ch, CURLOPT_FILETIME, 1L);
- HTTP_CURL_OPT_EX(ch, CURLOPT_AUTOREFERER, 1L);
- HTTP_CURL_OPT_EX(ch, CURLOPT_VERBOSE, 1L);
- HTTP_CURL_OPT_EX(ch, CURLOPT_HEADERFUNCTION, NULL);
- HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
- HTTP_CURL_OPT_EX(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
- HTTP_CURL_OPT_EX(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback);
- HTTP_CURL_OPT_EX(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback);
+ curl_easy_setopt(ch, CURLOPT_HEADER, 0L);
+ curl_easy_setopt(ch, CURLOPT_FILETIME, 1L);
+ curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1L);
+ curl_easy_setopt(ch, CURLOPT_VERBOSE, 1L);
+ curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, NULL);
+ curl_easy_setopt(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
+ curl_easy_setopt(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
+ curl_easy_setopt(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback);
+ curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback);
/* set context */
if (request) {
- HTTP_CURL_OPT_EX(ch, CURLOPT_PRIVATE, request);
- HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGDATA, request);
- HTTP_CURL_OPT_EX(ch, CURLOPT_ERRORBUFFER, request->_error);
+ 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;
{
if (*ch) {
/* avoid nasty segfaults with already cleaned up callbacks */
- HTTP_CURL_OPT_EX(*ch, CURLOPT_NOPROGRESS, 1L);
- HTTP_CURL_OPT_EX(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
- HTTP_CURL_OPT_EX(*ch, CURLOPT_VERBOSE, 0L);
- HTTP_CURL_OPT_EX(*ch, CURLOPT_DEBUGFUNCTION, NULL);
+ curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
+ curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
+ curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
+ curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);
curl_easy_cleanup(*ch);
*ch = NULL;
}
/* {{{ STATUS http_request_enable_cookies(http_request *) */
PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request)
{
+ int initialized = 1;
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
- if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIEFILE, "")) {
+
+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
+ if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIEFILE, "")) {
return SUCCESS;
}
http_error(HE_WARNING, HTTP_E_REQUEST, "Could not enable cookies for this session");
/* {{{ STATUS http_request_reset_cookies(http_request *, int) */
PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only)
{
+ int initialized = 1;
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
if (session_only) {
#if HTTP_CURL_VERSION(7,15,4)
- curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS");
- return SUCCESS;
-#else
- http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
+ if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS")) {
+ return SUCCESS;
+ }
#endif
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
} else {
#if HTTP_CURL_VERSION(7,14,1)
- curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL");
- return SUCCESS;
-#else
- http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
+ if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) {
+ return SUCCESS;
+ }
#endif
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
}
return FAILURE;
}
HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L);
HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
+ HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
+ HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0);
+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L);
+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L);
+#if HTTP_CURL_VERSION(7,15,5)
+ 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); */
+ HTTP_CURL_OPT(CURLOPT_FRESH_CONNECT, 0L);
+ HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 0L);
HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
HTTP_CURL_OPT(CURLOPT_PORT, 0L);
#if HTTP_CURL_VERSION(7,15,2)
HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0L);
HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0L);
HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL);
+#ifdef HTTP_CURL_CAINFO
+ HTTP_CURL_OPT(CURLOPT_CAINFO, HTTP_CURL_CAINFO);
+#else
HTTP_CURL_OPT(CURLOPT_CAINFO, NULL);
+#endif
HTTP_CURL_OPT(CURLOPT_CAPATH, NULL);
HTTP_CURL_OPT(CURLOPT_RANDOM_FILE, NULL);
HTTP_CURL_OPT(CURLOPT_EGDSOCKET, NULL);
}
}
+ /* dns */
+ if ((zoption = http_request_option(request, options, "dns_cache_timeout", IS_LONG))) {
+ HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, Z_LVAL_P(zoption));
+ }
+ if ((zoption = http_request_option(request, options, "ipresolve", IS_LONG)) && Z_LVAL_P(zoption)) {
+ HTTP_CURL_OPT(CURLOPT_IPRESOLVE, Z_LVAL_P(zoption));
+ }
+
+ /* limits */
+ if ((zoption = http_request_option(request, options, "low_speed_limit", IS_LONG))) {
+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, Z_LVAL_P(zoption));
+ }
+ if ((zoption = http_request_option(request, options, "low_speed_time", IS_LONG))) {
+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
+ }
+#if HTTP_CURL_VERSION(7,15,5)
+ 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_MAXCONNECTS, Z_LVAL_P(zoption));
+ } */
+ if ((zoption = http_request_option(request, options, "fresh_connect", IS_BOOL)) && Z_BVAL_P(zoption)) {
+ HTTP_CURL_OPT(CURLOPT_FRESH_CONNECT, 1L);
+ }
+ if ((zoption = http_request_option(request, options, "forbid_reuse", IS_BOOL)) && Z_BVAL_P(zoption)) {
+ HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 1L);
+ }
+
/* outgoing interface */
if ((zoption = http_request_option(request, options, "interface", IS_STRING))) {
HTTP_CURL_OPT(CURLOPT_INTERFACE, Z_STRVAL_P(zoption));
request->_cache.headers = NULL;
}
if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) {
- char *header_key;
- ulong header_idx;
+ HashKey header_key = initHashKey(0);
+ zval **header_val;
HashPosition pos;
- FOREACH_KEY(pos, zoption, header_key, header_idx) {
- if (header_key) {
- zval **header_val;
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &header_val, &pos)) {
- char header[1024] = {0};
-
- ZVAL_ADDREF(*header_val);
- convert_to_string_ex(header_val);
- if (!strcasecmp(header_key, "range")) {
- range_req = 1;
- }
- snprintf(header, lenof(header), "%s: %s", header_key, Z_STRVAL_PP(header_val));
- request->_cache.headers = curl_slist_append(request->_cache.headers, header);
- zval_ptr_dtor(header_val);
+ FOREACH_KEYVAL(pos, zoption, header_key, header_val) {
+ if (header_key.type == HASH_KEY_IS_STRING) {
+ char header[1024];
+
+ ZVAL_ADDREF(*header_val);
+ convert_to_string_ex(header_val);
+ if (!strcasecmp(header_key.str, "range")) {
+ range_req = 1;
}
-
- /* reset */
- header_key = NULL;
+ snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
+ request->_cache.headers = curl_slist_append(request->_cache.headers, header);
+ zval_ptr_dtor(header_val);
}
}
}
/* etag */
if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) {
- char match_header[1024] = {0}, *quoted_etag = NULL;
+ char match_header[1024], *quoted_etag = NULL;
if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) {
spprintf("ed_etag, 0, "\"%s\"", Z_STRVAL_P(zoption));
}
- snprintf(match_header, lenof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
+ snprintf(match_header, sizeof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
request->_cache.headers = curl_slist_append(request->_cache.headers, match_header);
STR_FREE(quoted_etag);
}
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(CURLOPT_TIMEVALUE, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(CURLOPT_TIMEVALUE, (long) HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption));
+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, (long) HTTP_G->request.time + Z_LVAL_P(zoption));
}
HTTP_CURL_OPT(CURLOPT_TIMECONDITION, (long) (range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE));
} else {
}
} else {
HashPosition pos;
- char *cookie_key = NULL;
- ulong cookie_idx;
+ HashKey cookie_key = initHashKey(0);
+ zval **cookie_val;
- 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;
+ FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) {
+ if (cookie_key.type == HASH_KEY_IS_STRING) {
+ zval *val = zval_copy(IS_STRING, *cookie_val);
+ phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
+ zval_free(&val);
}
}
/* ssl */
if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) {
- ulong idx;
- char *key = NULL;
+ HashKey key = initHashKey(0);
zval **param;
HashPosition pos;
- FOREACH_KEYVAL(pos, zoption, key, idx, param) {
- if (key) {
+ FOREACH_KEYVAL(pos, zoption, key, param) {
+ if (key.type == HASH_KEY_IS_STRING) {
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_CAPATH, -3, 1);
HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
-
- /* reset key */
- key = NULL;
}
}
}
}
/* }}} */
-/* {{{ void http_request_info(http_request *, HashTable *) */
-PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info)
-{
- zval array;
- INIT_ZARR(array, info);
-
- HTTP_CURL_INFO(CURLINFO_EFFECTIVE_URL);
- HTTP_CURL_INFO(CURLINFO_RESPONSE_CODE);
- HTTP_CURL_INFO_EX(CURLINFO_HTTP_CONNECTCODE, "connect_code");
- HTTP_CURL_INFO(CURLINFO_FILETIME);
- HTTP_CURL_INFO(CURLINFO_TOTAL_TIME);
- HTTP_CURL_INFO(CURLINFO_NAMELOOKUP_TIME);
- HTTP_CURL_INFO(CURLINFO_CONNECT_TIME);
- HTTP_CURL_INFO(CURLINFO_PRETRANSFER_TIME);
- HTTP_CURL_INFO(CURLINFO_STARTTRANSFER_TIME);
- HTTP_CURL_INFO(CURLINFO_REDIRECT_TIME);
- HTTP_CURL_INFO(CURLINFO_REDIRECT_COUNT);
- HTTP_CURL_INFO(CURLINFO_SIZE_UPLOAD);
- HTTP_CURL_INFO(CURLINFO_SIZE_DOWNLOAD);
- HTTP_CURL_INFO(CURLINFO_SPEED_DOWNLOAD);
- HTTP_CURL_INFO(CURLINFO_SPEED_UPLOAD);
- HTTP_CURL_INFO(CURLINFO_HEADER_SIZE);
- HTTP_CURL_INFO(CURLINFO_REQUEST_SIZE);
- HTTP_CURL_INFO(CURLINFO_SSL_VERIFYRESULT);
- HTTP_CURL_INFO(CURLINFO_SSL_ENGINES);
- HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_DOWNLOAD);
- HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_UPLOAD);
- HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE);
- HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL);
- HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL);
- HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS);
-#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);
-}
-/* }}} */
-
/* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */
static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ctx)
{
add_assoc_double(param, "ulnow", ulnow);
with_error_handling(EH_NORMAL, NULL) {
+ request->_in_progress_cb = 1;
call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, ¶m TSRMLS_CC);
+ request->_in_progress_cb = 0;
} end_error_handling();
zval_ptr_dtor(¶m);
{
http_request *request = (http_request *) ctx;
+#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
switch (type) {
case CURLINFO_DATA_IN:
if (request->conv.last_type == CURLINFO_HEADER_IN) {
phpstr_appends(&request->conv.response, HTTP_CRLF);
}
- case CURLINFO_HEADER_IN:
phpstr_append(&request->conv.response, data, length);
break;
- case CURLINFO_DATA_OUT:
- if (request->conv.last_type == CURLINFO_HEADER_OUT) {
- phpstr_appends(&request->conv.request, HTTP_CRLF);
+ case CURLINFO_HEADER_IN:
+ if (!EMPTY_HEADER(data, length)) {
+ phpstr_append(&request->conv.response, data, length);
}
+ break;
+ case CURLINFO_DATA_OUT:
case CURLINFO_HEADER_OUT:
phpstr_append(&request->conv.request, data, length);
break;
break;
}
+#if 0
+ fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+#endif
+
if (type) {
request->conv.last_type = type;
}