projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
928a3fa
)
catch "uploaded" state
author
Michael Wallner
<mike@php.net>
Wed, 16 Apr 2014 18:05:23 +0000
(20:05 +0200)
committer
Michael Wallner
<mike@php.net>
Wed, 16 Apr 2014 18:05:23 +0000
(20:05 +0200)
php_http_client_curl.c
patch
|
blob
|
history
diff --git
a/php_http_client_curl.c
b/php_http_client_curl.c
index c6918426264ea3fa32df358a5f208c2ba14d63b5..418a4c666504ddabd2fca3b21a3638795118a3e9 100644
(file)
--- a/
php_http_client_curl.c
+++ b/
php_http_client_curl.c
@@
-258,6
+258,8
@@
static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
h->progress.info = "blacklist check";
} else if (php_memnstr(data, ZEND_STRL("SSL"), data + length)) {
h->progress.info = "ssl negotiation";
h->progress.info = "blacklist check";
} else if (php_memnstr(data, ZEND_STRL("SSL"), data + length)) {
h->progress.info = "ssl negotiation";
+ } else if (php_memnstr(data, ZEND_STRL("upload"), data + length)) {
+ h->progress.info = "uploaded";
} else if (php_memnstr(data, ZEND_STRL("left intact"), data + length)) {
h->progress.info = "not disconnected";
} else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
} else if (php_memnstr(data, ZEND_STRL("left intact"), data + length)) {
h->progress.info = "not disconnected";
} else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
@@
-269,6
+271,7
@@
static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
} else {
#if PHP_DEBUG
h->progress.info = data;
} else {
#if PHP_DEBUG
h->progress.info = data;
+ data[length - 1] = '\0';
#endif
}
if (h->client->callback.progress.func) {
#endif
}
if (h->client->callback.progress.func) {