projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- version bump
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index bfb3574da277345d342f217154aa5699292f2c07..797e9a2a54744e6881ea7fc430baf080513ac3db 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-947,21
+947,30
@@
static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
{
http_request *request = (http_request *) ctx;
{
http_request *request = (http_request *) ctx;
+#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
switch (type) {
case CURLINFO_DATA_IN:
if (request->conv.last_type == CURLINFO_HEADER_IN) {
phpstr_appends(&request->conv.response, HTTP_CRLF);
}
switch (type) {
case CURLINFO_DATA_IN:
if (request->conv.last_type == CURLINFO_HEADER_IN) {
phpstr_appends(&request->conv.response, HTTP_CRLF);
}
- case CURLINFO_HEADER_IN:
phpstr_append(&request->conv.response, data, length);
break;
phpstr_append(&request->conv.response, data, length);
break;
+ case CURLINFO_HEADER_IN:
+ if (!EMPTY_HEADER(data, length)) {
+ phpstr_append(&request->conv.response, data, length);
+ }
+ break;
case CURLINFO_DATA_OUT:
if (request->conv.last_type == CURLINFO_HEADER_OUT) {
phpstr_appends(&request->conv.request, HTTP_CRLF);
}
case CURLINFO_DATA_OUT:
if (request->conv.last_type == CURLINFO_HEADER_OUT) {
phpstr_appends(&request->conv.request, HTTP_CRLF);
}
- case CURLINFO_HEADER_OUT:
phpstr_append(&request->conv.request, data, length);
break;
phpstr_append(&request->conv.request, data, length);
break;
+ case CURLINFO_HEADER_OUT:
+ if (!EMPTY_HEADER(data, length)) {
+ phpstr_append(&request->conv.request, data, length);
+ }
+ break;
default:
#if 0
fprintf(stderr, "## ", type);
default:
#if 0
fprintf(stderr, "## ", type);
@@
-980,13
+989,14
@@
static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
if (data[length-1] != 0xa) {
fprintf(stderr, "\n");
}
if (data[length-1] != 0xa) {
fprintf(stderr, "\n");
}
-#endif
-#if 0
- fprintf(stderr, "%.*s%s", length, data, data[length-1]=='\n'?"":"\n");
#endif
break;
}
#endif
break;
}
+#if 0
+ fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+#endif
+
if (type) {
request->conv.last_type = type;
}
if (type) {
request->conv.last_type = type;
}