/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#include "php_http.h"
/* }}} */
/* {{{ CURL *http_curl_init(http_request *) */
-PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, void *context, char *error_buffer)
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
{
if (ch || (ch = curl_easy_init())) {
#if defined(ZTS)
HTTP_CURL_OPT_EX(ch, READFUNCTION, http_curl_read_callback);
HTTP_CURL_OPT_EX(ch, IOCTLFUNCTION, http_curl_ioctl_callback);
HTTP_CURL_OPT_EX(ch, WRITEFUNCTION, http_curl_dummy_callback);
- HTTP_CURL_OPT_EX(ch, DEBUGDATA, context);
- HTTP_CURL_OPT_EX(ch, PRIVATE, context);
- HTTP_CURL_OPT_EX(ch, ERRORBUFFER, error_buffer);
+
+ /* set context */
+ if (request) {
+ HTTP_CURL_OPT_EX(ch, PRIVATE, request);
+ HTTP_CURL_OPT_EX(ch, DEBUGDATA, request);
+ HTTP_CURL_OPT_EX(ch, ERRORBUFFER, request->_error);
+
+ /* attach curl handle */
+ request->ch = ch;
+ /* set defaults (also in http_request_reset()) */
+ http_request_defaults(request);
+ }
}
return ch;
HTTP_CURL_OPT(READDATA, NULL);
HTTP_CURL_OPT(INFILESIZE, 0);
HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
+ HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+ HTTP_CURL_OPT(NOBODY, 0);
+ HTTP_CURL_OPT(POST, 0);
+ HTTP_CURL_OPT(UPLOAD, 0);
+ HTTP_CURL_OPT(HTTPGET, 1);
}
}
/* }}} */
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
- http_request_defaults(request);
/* set options */
HTTP_CURL_OPT(URL, request->url);
/* useragent, default "PECL::HTTP/version (PHP/version)" */
if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
+ /* allow to send no user agent, not even default one */
if (Z_STRLEN_P(zoption)) {
HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
} else {
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(TIMEVALUE, time(NULL) + Z_LVAL_P(zoption));
+ HTTP_CURL_OPT(TIMEVALUE, HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption));
}
HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
} else {
switch (request->meth)
{
case HTTP_GET:
- HTTP_CURL_OPT(NOBODY, 0);
- HTTP_CURL_OPT(POST, 0);
- HTTP_CURL_OPT(UPLOAD, 0);
HTTP_CURL_OPT(HTTPGET, 1);
break;
case HTTP_HEAD:
- HTTP_CURL_OPT(POST, 0);
- HTTP_CURL_OPT(UPLOAD, 0);
- HTTP_CURL_OPT(HTTPGET, 0);
HTTP_CURL_OPT(NOBODY, 1);
break;
case HTTP_POST:
- HTTP_CURL_OPT(UPLOAD, 0);
- HTTP_CURL_OPT(HTTPGET, 0);
- HTTP_CURL_OPT(NOBODY, 0);
HTTP_CURL_OPT(POST, 1);
break;
case HTTP_PUT:
- HTTP_CURL_OPT(HTTPGET, 0);
- HTTP_CURL_OPT(NOBODY, 0);
- HTTP_CURL_OPT(POST, 0);
HTTP_CURL_OPT(UPLOAD, 1);
break;
default:
- HTTP_CURL_OPT(HTTPGET, 0);
- HTTP_CURL_OPT(NOBODY, 0);
- HTTP_CURL_OPT(POST, 0);
- HTTP_CURL_OPT(UPLOAD, 0);
if (http_request_method_exists(0, request->meth, NULL)) {
HTTP_CURL_OPT(CUSTOMREQUEST, http_request_method_name(request->meth));
} else {