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 sending userspace streams (only reading 8k at once)
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index 7927648221c52a624dd977ca0095a6342a795dd3..a1779aa2587ae216a111ec06a941d0d130cb95d2 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-557,7
+557,7
@@
PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
#if HTTP_CURL_VERSION(7,15,2)
if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) {
#if HTTP_CURL_VERSION(7,15,2)
if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) {
- zval *
prs,
*pre;
+ zval *
*prs, *
*pre;
zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &prs)) {
zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &prs)) {
@@
-567,7
+567,7
@@
PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
- HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE,
ABS
(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE,
labs
(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
}
zval_free(&prs_cpy);
zval_free(&pre_cpy);
}
zval_free(&prs_cpy);
zval_free(&pre_cpy);
@@
-971,7
+971,7
@@
static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ct
size_t out = MIN(len * n, request->body->size - request->body->priv);
if (out) {
size_t out = MIN(len * n, request->body->size - request->body->priv);
if (out) {
- memcpy(data,
request->body->data
+ request->body->priv, out);
+ memcpy(data,
((char *) request->body->data)
+ request->body->priv, out);
request->body->priv += out;
return out;
}
request->body->priv += out;
return out;
}