- php_http_header_parser_t *parser = php_http_header_parser_init(NULL TSRMLS_CC);
- php_http_buffer_t *buf = php_http_buffer_from_string(header_str, header_len);
-
- if (parser && buf) {
- php_http_header_parser_state_t rs;
-
- array_init(return_value);
-
- rs = php_http_header_parser_parse(parser, buf,
- PHP_HTTP_HEADER_PARSER_CLEANUP, Z_ARRVAL_P(return_value), NULL, NULL);
-
- if (rs == PHP_HTTP_HEADER_PARSER_STATE_FAILURE) {
- php_http_error(HE_WARNING, PHP_HTTP_E_MALFORMED_HEADERS, "Could not parse headers");
- zval_dtor(return_value);
- RETVAL_NULL();
- } else {
- if (ce && instanceof_function(ce, php_http_header_class_entry TSRMLS_CC)) {
- HashPosition pos;
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- zval **val;
-
- FOREACH_KEYVAL(pos, return_value, key, val) {
- zval *zho, *zkey, *zvalue;
-
- Z_ADDREF_PP(val);
- zvalue = *val;
-
- MAKE_STD_ZVAL(zkey);
- if (key.type == HASH_KEY_IS_LONG) {
- ZVAL_LONG(zkey, key.num);
- } else {
- ZVAL_STRINGL(zkey, key.str, key.len - 1, 1);
- }
-
- MAKE_STD_ZVAL(zho);
- object_init_ex(zho, ce);
- zend_call_method_with_2_params(&zho, ce, NULL, "__construct", NULL, zkey, zvalue);
-
- if (key.type == HASH_KEY_IS_LONG) {
- zend_hash_index_update(Z_ARRVAL_P(return_value), key.num, (void *) &zho, sizeof(zval *), NULL);
- } else {
- zend_hash_update(Z_ARRVAL_P(return_value), key.str, key.len, (void *) &zho, sizeof(zval *), NULL);
- }
-
- zval_ptr_dtor(&zvalue);
- zval_ptr_dtor(&zkey);
+ array_init(return_value);
+
+ if (SUCCESS != php_http_headers_parse(header_str, header_len, Z_ARRVAL_P(return_value), NULL, NULL TSRMLS_CC)) {
+ php_http_error(HE_WARNING, PHP_HTTP_E_MALFORMED_HEADERS, "Could not parse headers");
+ zval_dtor(return_value);
+ RETVAL_NULL();
+ } else {
+ if (ce && instanceof_function(ce, php_http_header_class_entry TSRMLS_CC)) {
+ HashPosition pos;
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ zval **val;
+
+ FOREACH_KEYVAL(pos, return_value, key, val) {
+ zval *zho, *zkey, *zvalue;
+
+ Z_ADDREF_PP(val);
+ zvalue = *val;
+
+ MAKE_STD_ZVAL(zkey);
+ if (key.type == HASH_KEY_IS_LONG) {
+ ZVAL_LONG(zkey, key.num);
+ } else {
+ ZVAL_STRINGL(zkey, key.str, key.len - 1, 1);