msg = http_message_init(msg);
- if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, &msg)) {
+ if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
if (free_msg) {
http_message_free(&msg);
}
const char *continue_at = NULL;
/* message has chunked transfer encoding */
- if (c = http_message_header(msg, "Transfer-Encoding")) {
- if (!strcasecmp("chunked", Z_STRVAL_P(c))) {
- 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", (ulong) 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);
- }
+ if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) {
+ 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", (ulong) 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
zval strct;
zval *headers;
- Z_TYPE(strct) = IS_ARRAY;
- Z_ARRVAL(strct) = HASH_OF(obj);
+ INIT_ZARR(strct, HASH_OF(obj));
add_assoc_long(&strct, "type", msg->type);
add_assoc_double(&strct, "httpVersion", msg->http.version);
char *uri = NULL;
zval **zhost, options, headers;
+ INIT_PZVAL(&options);
+ INIT_PZVAL(&headers);
array_init(&options);
array_init(&headers);
zend_hash_copy(Z_ARRVAL(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));