#include "php_http_api.h"
#include "php_http_request_api.h"
#include "php_http_url_api.h"
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+# include "php_http_persistent_handle_api.h"
+#endif
#ifdef ZEND_ENGINE_2
# include "php_http_request_object.h"
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);
return FAILURE;
}
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+ if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup)) {
+ return FAILURE;
+ }
+#endif
+
HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
/* {{{ 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) {
static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
/* }}} */
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+# define HTTP_CURL_HANDLE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request", &(ch)))
+# define HTTP_CURL_HANDLE_DTOR(chp) http_persistent_handle_release("http_request", (chp))
+#else
+# define HTTP_CURL_HANDLE_CTOR(ch) ((ch) = curl_easy_init())
+# define HTTP_CURL_HANDLE_DTOR(chp) curl_easy_cleanup(*(chp)); *(chp) = NULL
+#endif
+
/* {{{ CURL *http_curl_init(http_request *) */
-PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC)
{
- if (ch || (ch = curl_easy_init())) {
+ if (ch || HTTP_CURL_HANDLE_CTOR(ch)) {
#if defined(ZTS)
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
#endif
/* }}} */
/* {{{ void http_curl_free(CURL **) */
-PHP_HTTP_API void _http_curl_free(CURL **ch)
+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC)
{
if (*ch) {
- /* avoid nasty segfaults with already cleaned up callbacks */
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;
+
+ HTTP_CURL_HANDLE_DTOR(ch);
}
}
/* }}} */
/* {{{ void http_request_dtor(http_request *) */
PHP_HTTP_API void _http_request_dtor(http_request *request)
{
+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+
http_curl_free(&request->ch);
http_request_reset(request);
FOREACH_KEYVAL(pos, zoption, header_key, header_val) {
if (header_key.type == HASH_KEY_IS_STRING) {
- char header[1024] = {0};
+ char header[1024];
ZVAL_ADDREF(*header_val);
convert_to_string_ex(header_val);
if (!strcasecmp(header_key.str, "range")) {
range_req = 1;
}
- snprintf(header, lenof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
+ 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);
}
HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption));
}
+#if HTTP_CURL_VERSION(7,16,2)
+ /* timeout, defaults to 0 */
+ if ((zoption = http_request_option(request, options, "timeout", IS_DOUBLE))) {
+ HTTP_CURL_OPT(CURLOPT_TIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
+ }
+ /* connecttimeout, defaults to 0 */
+ if ((zoption = http_request_option(request, options, "connecttimeout", IS_DOUBLE))) {
+ HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
+ }
+#else
/* timeout, defaults to 0 */
if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
}
-
/* connecttimeout, defaults to 0 */
if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) {
HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
}
+#endif
/* ssl */
if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) {
{
http_request *request = (http_request *) ctx;
+#define EMPTY_HEADER(d, l) (!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;
default:
+ break;
+ }
+
#if 0
- fprintf(stderr, "## ", type);
- if (!type) {
- fprintf(stderr, "%s", data);
- } else {
- ulong i;
- for (i = 1; i <= length; ++i) {
- fprintf(stderr, "%02X ", data[i-1] & 0xFF);
- if (!(i % 20)) {
- fprintf(stderr, "\n## ");
- }
+ {
+ const char _sym[] = "><><><";
+ if (type) {
+ for (fprintf(stderr, "%c ", _sym[type-1]); length--; data++) {
+ fprintf(stderr, HTTP_IS_CTYPE(print, *data)?"%c":"\\x%02X", (int) *data);
+ if (*data == '\n' && length) {
+ fprintf(stderr, "\n%c ", _sym[type-1]);
}
- fprintf(stderr, "\n");
- }
- if (data[length-1] != 0xa) {
- fprintf(stderr, "\n");
}
-#endif
-#if 0
- fprintf(stderr, "%.*s%s", length, data, data[length-1]=='\n'?"":"\n");
-#endif
- break;
+ fprintf(stderr, "\n");
+ } else {
+ fprintf(stderr, "# %s", data);
+ }
}
-
+#endif
+
if (type) {
request->conv.last_type = type;
}