/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#include "php_http.h"
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);
}
}
/* }}} */
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 {