projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix edge cases with @
[m6w6/ext-http]
/
php_http_client_curl.c
diff --git
a/php_http_client_curl.c
b/php_http_client_curl.c
index 4056e9260ab9dbfb261c8be5ab04f13cb3c99b36..9fc0291e5f0c8f528f68bff434799dc3114d0529 100644
(file)
--- a/
php_http_client_curl.c
+++ b/
php_http_client_curl.c
@@
-282,7
+282,7
@@
static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
} else if (php_memnstr(data, ZEND_STRL("Operation timed out"), data + length)) {
h->progress.info = "timeout";
} else {
} else if (php_memnstr(data, ZEND_STRL("Operation timed out"), data + length)) {
h->progress.info = "timeout";
} else {
-#if
PHP_DEBUG
+#if
0
h->progress.info = data;
data[length - 1] = '\0';
#endif
h->progress.info = data;
data[length - 1] = '\0';
#endif
@@
-903,7
+903,7
@@
static STATUS php_http_curle_option_set_lastmodified(php_http_option_t *opt, zva
return FAILURE;
}
} else {
return FAILURE;
}
} else {
- if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long)
PHP_HTTP_G->env.request.time
+ Z_LVAL_P(val))) {
+ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long)
sapi_get_request_time(TSRMLS_C)
+ Z_LVAL_P(val))) {
return FAILURE;
}
}
return FAILURE;
}
}