#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
#ifdef HTTP_HAVE_CURL
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_request_api.h"
#include "php_http_request_method_api.h"
#include "php_http_url_api.h"
+
#ifdef ZEND_ENGINE_2
# include "php_http_request_object.h"
#endif
-#include "phpstr/phpstr.h"
-
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
/* {{{ cruft for thread safe SSL crypto locks */
#if defined(ZTS) && defined(HTTP_HAVE_SSL)
# ifdef PHP_WIN32
return FAILURE;
}
-#if LIBCURL_VERSION_NUM >= 0x070a05
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_ANY", CURLAUTH_ANY);
-#endif /* LIBCURL_VERSION_NUM */
return SUCCESS;
}
}
#ifndef HAVE_CURL_EASY_STRERROR
-# define curl_easy_strerror(code) HTTP_G(request).error
+# define curl_easy_strerror(dummy) "unkown error"
#endif
#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
} \
} \
break; \
+\
+ case CURLINFO_SLIST: \
+ { \
+ struct curl_slist *l, *p; \
+ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \
+ zval *subarray; \
+ MAKE_STD_ZVAL(subarray); \
+ array_init(subarray); \
+ for (p = l; p; p = p->next) { \
+ zval *entry; \
+ MAKE_STD_ZVAL(entry); \
+ ZVAL_STRING(entry, p->data, 1); \
+ add_next_index_zval(subarray, entry); \
+ } \
+ add_assoc_zval(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), subarray); \
+ curl_slist_free_all(l); \
+ } \
+ } \
}
#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p))
/* }}} */
/* {{{ void http_request_body_free(http_request_body *) */
-PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
+PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC)
{
- if (body) {
- http_request_body_dtor(body);
- efree(body);
+ if (*body) {
+ http_request_body_dtor(*body);
+ efree(*body);
+ *body = NULL;
}
}
/* }}} */
HTTP_CURL_OPT(VERBOSE, 1);
HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
-#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
+#if defined(ZTS)
HTTP_CURL_OPT(NOSIGNAL, 1);
#endif
-#if LIBCURL_VERSION_NUM < 0x070c00
- HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error);
-#endif
/* progress callback */
- if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+ if ((zoption = http_curl_getopt(options, "onprogress", 0))) {
HTTP_CURL_OPT(NOPROGRESS, 0);
HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
HTTP_CURL_OPT(PROGRESSDATA, http_request_callback_data(zoption));
}
/* proxy */
- if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "proxyhost", IS_STRING))) {
HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
/* port */
- if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "proxyport", IS_LONG))) {
HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
}
/* user:pass */
- if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) {
HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
-#if LIBCURL_VERSION_NUM >= 0x070a07
/* auth method */
- if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) {
HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption));
}
-#endif
}
/* outgoing interface */
- if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "interface", IS_STRING))) {
HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* another port */
- if (zoption = http_curl_getopt(options, "port", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "port", IS_LONG))) {
HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption));
}
/* auth */
- if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) {
HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
-#if LIBCURL_VERSION_NUM >= 0x070a06
- if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) {
HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
}
-#endif
/* compress, empty string enables all supported if libcurl was build with zlib support */
if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
- HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0");
-#else
+#ifdef HTTP_HAVE_CURL_ZLIB
HTTP_CURL_OPT(ENCODING, "");
+#else
+ HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
#endif
}
/* redirects, defaults to 0 */
- if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "redirect", IS_LONG))) {
HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption));
- if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) {
+ if ((zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL))) {
HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
}
}
/* referer */
- if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "referer", IS_STRING))) {
HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* useragent, default "PECL::HTTP/version (PHP/version)" */
- if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
+ if ((zoption = http_curl_getopt(options, "useragent", IS_STRING))) {
HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* additional headers, array('name' => 'value') */
- if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
+ if ((zoption = http_curl_getopt(options, "headers", IS_ARRAY))) {
char *header_key;
ulong header_idx;
HashPosition pos;
}
/* cookies, array('name' => 'value') */
- if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
+ if ((zoption = http_curl_getopt(options, "cookies", IS_ARRAY))) {
char *cookie_key = NULL;
ulong cookie_idx = 0;
HashPosition pos;
}
/* session cookies */
- if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) {
+ if ((zoption = http_curl_getopt(options, "cookiesession", IS_BOOL))) {
if (Z_LVAL_P(zoption)) {
/* accept cookies for this session */
HTTP_CURL_OPT(COOKIEFILE, "");
}
/* maxfilesize */
- if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "maxfilesize", IS_LONG))) {
HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
}
/* lastmodified */
- if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "lastmodified", IS_LONG))) {
if (Z_LVAL_P(zoption)) {
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
}
/* timeout, defaults to 0 */
- if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "timeout", IS_LONG))) {
HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
}
/* connecttimeout, defaults to 3 */
- if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
+ if ((zoption = http_curl_getopt(options, "connecttimeout", IS_LONG))) {
HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
}
/* ssl */
- if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) {
+ if ((zoption = http_curl_getopt(options, "ssl", IS_ARRAY))) {
ulong idx;
char *key = NULL;
zval **param;
FOREACH_KEYVAL(pos, zoption, key, idx, param) {
if (key) {
HTTP_CURL_OPT_SSL_STRING(CERT);
-#if LIBCURL_VERSION_NUM >= 0x070903
HTTP_CURL_OPT_SSL_STRING(CERTTYPE);
-#endif
HTTP_CURL_OPT_SSL_STRING(CERTPASSWD);
HTTP_CURL_OPT_SSL_STRING(KEY);
HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST);
HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST);
-
HTTP_CURL_OPT_STRING(CAINFO);
-#if LIBCURL_VERSION_NUM >= 0x070908
HTTP_CURL_OPT_STRING(CAPATH);
-#endif
HTTP_CURL_OPT_STRING(RANDOM_FILE);
HTTP_CURL_OPT_STRING(EGDSOCKET);
/* perform request */
if (CURLE_OK != (result = curl_easy_perform(ch))) {
- http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result));
- return FAILURE;
- } else {
- /* get curl info */
- if (info) {
- http_request_info(ch, info);
- }
- return SUCCESS;
+ http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(result));
+ }
+ /* get curl info */
+ if (info) {
+ http_request_info(ch, info);
}
+ /* always succeeds */
+ return SUCCESS;
}
/* }}} */
INIT_ZARR(array, info);
HTTP_CURL_INFO(EFFECTIVE_URL);
-#if LIBCURL_VERSION_NUM >= 0x070a07
HTTP_CURL_INFO(RESPONSE_CODE);
-#else
- HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE);
-#endif
- HTTP_CURL_INFO(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM >= 0x070500
+ HTTP_CURL_INFO_EX(HTTP_CONNECTCODE, connect_code);
HTTP_CURL_INFO(FILETIME);
-#endif
HTTP_CURL_INFO(TOTAL_TIME);
HTTP_CURL_INFO(NAMELOOKUP_TIME);
HTTP_CURL_INFO(CONNECT_TIME);
HTTP_CURL_INFO(PRETRANSFER_TIME);
HTTP_CURL_INFO(STARTTRANSFER_TIME);
-#if LIBCURL_VERSION_NUM >= 0x070907
HTTP_CURL_INFO(REDIRECT_TIME);
HTTP_CURL_INFO(REDIRECT_COUNT);
-#endif
HTTP_CURL_INFO(SIZE_UPLOAD);
HTTP_CURL_INFO(SIZE_DOWNLOAD);
HTTP_CURL_INFO(SPEED_DOWNLOAD);
HTTP_CURL_INFO(HEADER_SIZE);
HTTP_CURL_INFO(REQUEST_SIZE);
HTTP_CURL_INFO(SSL_VERIFYRESULT);
-#if LIBCURL_VERSION_NUM >= 0x070c03
- /*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */
-#endif
+ HTTP_CURL_INFO(SSL_ENGINES);
HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD);
HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD);
HTTP_CURL_INFO(CONTENT_TYPE);
-#if LIBCURL_VERSION_NUM >= 0x070a03
/*HTTP_CURL_INFO(PRIVATE);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070a08
HTTP_CURL_INFO(HTTPAUTH_AVAIL);
HTTP_CURL_INFO(PROXYAUTH_AVAIL);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c02
/*HTTP_CURL_INFO(OS_ERRNO);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c03
HTTP_CURL_INFO(NUM_CONNECTS);
+#if LIBCURL_VERSION_NUM >= 0x070e01
+ HTTP_CURL_INFO_EX(COOKIELIST, cookies);
#endif
}
/* }}} */
phpstr_append(conv->request, data, length);
}
break;
-#if 0
default:
+#if 0
fprintf(stderr, "## ", type);
if (!type) {
fprintf(stderr, "%s", data);
if (data[length-1] != 0xa) {
fprintf(stderr, "\n");
}
- break;
#endif
+ break;
}
if (type) {
HTTP_CURL_OPT(PROXY, NULL);
HTTP_CURL_OPT(PROXYPORT, 0);
HTTP_CURL_OPT(PROXYUSERPWD, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070a07
HTTP_CURL_OPT(PROXYAUTH, 0);
-#endif
HTTP_CURL_OPT(INTERFACE, NULL);
HTTP_CURL_OPT(PORT, 0);
HTTP_CURL_OPT(USERPWD, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070a06
HTTP_CURL_OPT(HTTPAUTH, 0);
-#endif
HTTP_CURL_OPT(ENCODING, 0);
HTTP_CURL_OPT(FOLLOWLOCATION, 0);
HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
HTTP_CURL_OPT(REFERER, NULL);
- HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+ HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
HTTP_CURL_OPT(HTTPHEADER, NULL);
HTTP_CURL_OPT(COOKIE, NULL);
HTTP_CURL_OPT(COOKIEFILE, NULL);
HTTP_CURL_OPT(TIMEOUT, 0);
HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
HTTP_CURL_OPT(SSLCERT, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070903
HTTP_CURL_OPT(SSLCERTTYPE, NULL);
-#endif
HTTP_CURL_OPT(SSLCERTPASSWD, NULL);
HTTP_CURL_OPT(SSLKEY, NULL);
HTTP_CURL_OPT(SSLKEYTYPE, NULL);
HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
HTTP_CURL_OPT(SSL_CIPHER_LIST, NULL);
HTTP_CURL_OPT(CAINFO, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070908
HTTP_CURL_OPT(CAPATH, NULL);
-#endif
HTTP_CURL_OPT(RANDOM_FILE, NULL);
HTTP_CURL_OPT(EGDSOCKET, NULL);
HTTP_CURL_OPT(POSTFIELDS, NULL);
projects / m6w6 / ext-http / blobdiff