#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include "php.h"
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
-#include "phpstr/phpstr.h"
+#ifdef HTTP_HAVE_CURL
-#include "php.h"
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_request_api.h"
#include "php_http_url_api.h"
+#ifdef ZEND_ENGINE_2
+# include "php_http_request_object.h"
+#endif
-#ifndef HTTP_CURL_USE_ZEND_MM
-# define HTTP_CURL_USE_ZEND_MM 0
+#include "phpstr/phpstr.h"
+
+#ifdef PHP_WIN32
+# include <winsock2.h>
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http)
+#include <curl/curl.h>
+
+ZEND_EXTERN_MODULE_GLOBALS(http);
#if LIBCURL_VERSION_NUM < 0x070c00
# define curl_easy_strerror(code) HTTP_G(request).error
continue; \
}
-
static const char *const http_request_methods[HTTP_MAX_REQUEST_METHOD + 1];
#define http_curl_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC)
#define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC)
static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC);
-static size_t http_curl_write_callback(char *, size_t, size_t, void *);
static size_t http_curl_read_callback(void *, size_t, size_t, void *);
static int http_curl_progress_callback(void *, double, double, double, double);
-static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
+static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *);
+static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; }
#define HTTP_CURL_CALLBACK_DATA(from, type, var) \
http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
-#if HTTP_CURL_USE_ZEND_MM
-static void http_curl_free(void *p) { efree(p); }
-static char *http_curl_strdup(const char *p) { return estrdup(p); }
-static void *http_curl_malloc(size_t s) { return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); }
-#endif
-
-/* {{{ STATUS http_request_global_init() */
-STATUS _http_request_global_init(void)
-{
-#if HTTP_CURL_USE_ZEND_MM
- if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
- http_curl_malloc,
- http_curl_free,
- http_curl_realloc,
- http_curl_strdup,
- http_curl_calloc)) {
- return FAILURE;
- }
-#else
- if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
- return FAILURE;
- }
-#endif
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ void *http_request_data_copy(int, void *) */
void *_http_request_data_copy(int type, void *data TSRMLS_DC)
{
return data;
}
+ case COPY_CONV:
+ {
+ zend_llist_add_element(&HTTP_G(request).copies.convs, &data);
+ return data;
+ }
+
default:
{
return data;
}
/* }}} */
+/* {{{ _http_request_data_free_conv(http_curl_conv **) */
+void _http_request_data_free_conv(void *conv)
+{
+ efree(*((http_curl_conv **) conv));
+}
+/* }}} */
+
/* {{{ http_request_body *http_request_body_new() */
PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D)
{
CURLFORM_END
);
if (CURLE_OK != err) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post fields: %s", curl_easy_strerror(err));
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err));
curl_formfree(http_post_data[0]);
return FAILURE;
}
CURLFORM_END
);
if (CURLE_OK != err) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post files: %s", curl_easy_strerror(err));
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: %s", curl_easy_strerror(err));
curl_formfree(http_post_data[0]);
return FAILURE;
}
} else {
- http_error(E_NOTICE, HTTP_E_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
+ http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
}
}
size_t encoded_len;
if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) {
- http_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data");
+ http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data");
return FAILURE;
}
}
/* }}} */
-/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *, phpstr *) */
-PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
+/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *) */
+PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options TSRMLS_DC)
{
zval *zoption;
zend_bool range_req = 0;
HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url));
}
- if (response) {
- http_curl_callback_ctx *response_ctx = http_curl_callback_data(response);
- HTTP_CURL_OPT(WRITEDATA, response_ctx);
- HTTP_CURL_OPT(WRITEHEADER, response_ctx);
- }
-
HTTP_CURL_OPT(HEADER, 0);
HTTP_CURL_OPT(FILETIME, 1);
HTTP_CURL_OPT(AUTOREFERER, 1);
HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
- HTTP_CURL_OPT(WRITEFUNCTION, http_curl_write_callback);
- HTTP_CURL_OPT(HEADERFUNCTION, http_curl_write_callback);
+ /* we'll get all data through the debug function */
+ HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
+ HTTP_CURL_OPT(HEADERFUNCTION, NULL);
+
+ HTTP_CURL_OPT(VERBOSE, 1);
+ HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
HTTP_CURL_OPT(NOSIGNAL, 1);
/* progress callback */
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_curl_callback_data(zoption));
} else {
HTTP_CURL_OPT(NOPROGRESS, 1);
}
- /* debug callback */
- if (zoption = http_curl_getopt(options, "ondebug", 0)) {
- HTTP_CURL_OPT(VERBOSE, 1);
- HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback);
- HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(zoption));
- } else {
- HTTP_CURL_OPT(VERBOSE, 0);
- }
-
/* proxy */
if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
} else {
HTTP_CURL_OPT(COOKIEFILE, NULL);
}
-
+
/* cookiestore, read initial cookies from that file and store cookies back into that file */
if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
HTTP_CURL_OPT(TIMEVALUE, 0);
}
- /* timeout */
+ /* timeout, defaults to 3 */
if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(TIMEOUT, 1);
+ HTTP_CURL_OPT(TIMEOUT, 3);
}
- /* connecttimeout, defaults to 1 */
+ /* connecttimeout, defaults to 3 */
if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(CONNECTTIMEOUT, 1);
+ HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
}
/* ssl */
if (http_request_method_exists(0, meth, NULL)) {
curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(meth));
} else {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Unsupported request method: %d", meth);
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d", meth);
return FAILURE;
}
break;
break;
default:
- http_error_ex(E_WARNING, HTTP_E_CURL, "Unknown request body type: %d", body->type);
+ /* shouldn't ever happen */
+ http_error_ex(HE_ERROR, 0, "Unknown request body type: %d", body->type);
return FAILURE;
break;
}
}
/* }}} */
+/* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */
+void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC)
+{
+ http_curl_conv *conv = emalloc(sizeof(http_curl_conv));
+ conv->response = response;
+ conv->request = request;
+ conv->last_info = -1;
+ HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(http_request_data_copy(COPY_CONV, conv)));
+}
+/* }}} */
+
/* {{{ STATUS http_request_exec(CURL *, HashTable *) */
-PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *response, phpstr *request TSRMLS_DC)
{
CURLcode result;
+ http_request_conv(ch, response, request);
+
/* perform request */
if (CURLE_OK != (result = curl_easy_perform(ch))) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result));
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result));
return FAILURE;
} else {
/* get curl info */
if ((clean_curl = (!ch))) {
if (!(ch = curl_easy_init())) {
- http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl.");
return FAILURE;
}
}
- status = ((SUCCESS == http_request_init(ch, meth, url, body, options, response)) &&
- (SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE;
+ status = ((SUCCESS == http_request_init(ch, meth, url, body, options)) &&
+ (SUCCESS == http_request_exec(ch, info, response, NULL))) ? SUCCESS : FAILURE;
if (clean_curl) {
curl_easy_cleanup(ch);
char *http_method;
if (SUCCESS != zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method), (void **) &zmethod)) {
- http_error_ex(E_NOTICE, HTTP_E_PARAM, "Request method with id %lu does not exist", method);
+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Request method with id %lu does not exist", method);
return FAILURE;
}
if ( (SUCCESS != zend_hash_index_del(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method)))
|| (SUCCESS != zend_hash_del(EG(zend_constants), http_method, strlen(http_method) + 1))) {
- http_error_ex(E_NOTICE, 0, "Could not unregister request method: %s", http_method);
+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: %s", http_method);
efree(http_method);
return FAILURE;
}
};
/* }}} */
-/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
-{
- HTTP_CURL_CALLBACK_DATA(s, phpstr *, str);
- return str ? phpstr_append(PHPSTR(str), buf, len * n) : len * n;
-}
-/* }}} */
-
/* {{{ 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 *s)
{
params_pass[2] = ¶ms_local[2];
params_pass[3] = ¶ms_local[3];
+ INIT_PZVAL(params_pass[0]);
+ INIT_PZVAL(params_pass[1]);
+ INIT_PZVAL(params_pass[2]);
+ INIT_PZVAL(params_pass[3]);
ZVAL_DOUBLE(params_pass[0], dltotal);
ZVAL_DOUBLE(params_pass[1], dlnow);
ZVAL_DOUBLE(params_pass[2], ultotal);
}
/* }}} */
-static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
+/* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */
+static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
{
- zval *params_pass[2], params_local[2], retval;
- HTTP_CURL_CALLBACK_DATA(data, zval *, func);
+ HTTP_CURL_CALLBACK_DATA(ctx, http_curl_conv *, conv);
- params_pass[0] = ¶ms_local[0];
- params_pass[1] = ¶ms_local[1];
-
- ZVAL_LONG(params_pass[0], type);
- ZVAL_STRINGL(params_pass[1], string, length, 1);
-
- call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+ switch (type)
+ {
+ case CURLINFO_DATA_IN:
+ if (conv->response && conv->last_info == CURLINFO_HEADER_IN) {
+ phpstr_appends(conv->response, HTTP_CRLF);
+ }
+ case CURLINFO_HEADER_IN:
+ if (conv->response) {
+ phpstr_append(conv->response, data, length);
+ }
+ break;
+ case CURLINFO_DATA_OUT:
+ if (conv->request && conv->last_info == CURLINFO_HEADER_OUT) {
+ phpstr_appends(conv->request, HTTP_CRLF);
+ }
+ case CURLINFO_HEADER_OUT:
+ if (conv->request) {
+ phpstr_append(conv->request, data, length);
+ }
+ break;
+ }
+ if (type) {
+ conv->last_info = type;
+ }
return 0;
}
+/* }}} */
+
/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */
static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
{
case IS_DOUBLE: convert_to_double_ex(zoption); break;
case IS_STRING: convert_to_string_ex(zoption); break;
case IS_ARRAY: convert_to_array_ex(zoption); break;
- case IS_OBJECT: convert_to_object_ex(zoption); break;
+ case IS_OBJECT: convert_to_object_ex(zoption); break;
default:
break;
}
}
/* }}} */
+#endif
+
/*
* Local variables:
* tab-width: 4
projects / m6w6 / ext-http / blobdiff