projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
add addref param to RETURN_OBJVAL() etc
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index 1da4e332b9ff4063b160c4bff23aa9d16d8d39a8..444e43fe5a6929992d3c04317a55d9ac9485cf1c 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-12,10
+12,7
@@
/* $Id$ */
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#include "php_http.h"
#define HTTP_WANT_CURL
#include "php_http.h"
@@
-392,6
+389,10
@@
PHP_HTTP_API void _http_request_defaults(http_request *request)
HTTP_CURL_OPT(INFILESIZE, 0);
HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
HTTP_CURL_OPT(CUSTOMREQUEST, 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);
}
}
/* }}} */
}
}
/* }}} */
@@
-586,7
+587,7
@@
PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_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 {
}
HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
} else {
@@
-643,42
+644,22
@@
PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
switch (request->meth)
{
case HTTP_GET:
switch (request->meth)
{
case HTTP_GET:
- 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);
break;
case HTTP_HEAD:
HTTP_CURL_OPT(HTTPGET, 1);
break;
case HTTP_HEAD:
- HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
- 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(NOBODY, 1);
break;
case HTTP_POST:
- HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
- 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(POST, 1);
break;
case HTTP_PUT:
- HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
- 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(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 {
if (http_request_method_exists(0, request->meth, NULL)) {
HTTP_CURL_OPT(CUSTOMREQUEST, http_request_method_name(request->meth));
} else {