#include "php_http_message_api.h"
#include "php_http_headers_api.h"
#include "php_http_send_api.h"
-#include "php_http_curl_api.h"
+#include "php_http_request_api.h"
#include "php_http_url_api.h"
#include "phpstr/phpstr.h"
char *decoded;
size_t decoded_len;
+ /* decode and replace Transfer-Encoding with Content-Length header */
if (continue_at = http_chunked_decode(body, message + message_length - body, &decoded, &decoded_len)) {
phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
+ efree(decoded);
+ {
+ zval *len;
+ char *tmp;
+
+ spprintf(&tmp, 0, "%lu", decoded_len);
+ MAKE_STD_ZVAL(len);
+ ZVAL_STRING(len, tmp, 0);
+
+ zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+ zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+ }
}
}
} else
}
}
- phpstr_appends(&str, HTTP_CRLF);
- phpstr_append(&str, PHPSTR_VAL(msg), PHPSTR_LEN(msg));
- phpstr_appends(&str, HTTP_CRLF);
+ if (PHPSTR_LEN(msg)) {
+ phpstr_appends(&str, HTTP_CRLF);
+ phpstr_append(&str, PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+ phpstr_appends(&str, HTTP_CRLF);
+ }
data = phpstr_data(&str, string, length);
if (!string) {
do {
http_message_tostring(message, &buf, &len);
- phpstr_append(&str, buf, len);
+ phpstr_prepend(&str, buf, len);
efree(buf);
} while (message = message->parent);
}
if (!strcasecmp("POST", message->info.request.method)) {
- rs = http_post_data(uri, PHPSTR_VAL(message), PHPSTR_LEN(message), Z_ARRVAL(options), NULL, NULL);
+ http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
+ rs = http_post(uri, &body, Z_ARRVAL(options), NULL, NULL);
} else
if (!strcasecmp("GET", message->info.request.method)) {
rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
return rs;
}
+PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC)
+{
+ /*
+ * TODO: unroll
+ */
+ http_message *new;
+ char *serialized_data;
+ size_t serialized_length;
+
+ http_message_serialize(msg, &serialized_data, &serialized_length);
+ new = http_message_parse(serialized_data, serialized_length);
+ efree(serialized_data);
+ return new;
+}
+
PHP_HTTP_API void _http_message_dtor(http_message *message)
{
if (message) {
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-