- better fix
authorMichael Wallner <mike@php.net>
Fri, 12 Jan 2007 14:31:40 +0000 (14:31 +0000)
committerMichael Wallner <mike@php.net>
Fri, 12 Jan 2007 14:31:40 +0000 (14:31 +0000)
http_request_api.c
php_http_std_defs.h

index 797e9a2..8657909 100644 (file)
@@ -961,15 +961,8 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
                        }
                        break;
                case CURLINFO_DATA_OUT:
-                       if (request->conv.last_type == CURLINFO_HEADER_OUT) {
-                               phpstr_appends(&request->conv.request, HTTP_CRLF);
-                       }
-                       phpstr_append(&request->conv.request, data, length);
-                       break;
                case CURLINFO_HEADER_OUT:
-                       if (!EMPTY_HEADER(data, length)) {
-                               phpstr_append(&request->conv.request, data, length);
-                       }
+                       phpstr_append(&request->conv.request, data, length);
                        break;
                default:
 #if 0
@@ -993,7 +986,7 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
                        break;
        }
 
-#if 0
+#if 1
        fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
 #endif
        
index a454d61..cf3e15f 100644 (file)
@@ -93,7 +93,7 @@ typedef int STATUS;
        }
 
 /* function accepts no args */
-#define NO_ARGS zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")
+#define NO_ARGS zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "");
 
 /* CR LF */
 #define HTTP_CRLF "\r\n"