projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge pull request #57 from m6w6/lc-utf8
[m6w6/ext-http]
/
src
/
php_http_message_parser.c
diff --git
a/src/php_http_message_parser.c
b/src/php_http_message_parser.c
index 535a2b3849fd1b103aead321333e4104a00ba25c..db935d913cbc694f3b0000bdd0009dbc64e4d5cc 100644
(file)
--- a/
src/php_http_message_parser.c
+++ b/
src/php_http_message_parser.c
@@
-534,7
+534,11
@@
php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
return php_http_message_parser_state_is(parser);
}
return php_http_message_parser_state_is(parser);
}
-zend_class_entry *php_http_message_parser_class_entry;
+static zend_class_entry *php_http_message_parser_class_entry;
+zend_class_entry *php_http_get_message_parser_class_entry(void)
+{
+ return php_http_message_parser_class_entry;
+}
static zend_object_handlers php_http_message_parser_object_handlers;
zend_object *php_http_message_parser_object_new(zend_class_entry *ce)
static zend_object_handlers php_http_message_parser_object_handlers;
zend_object *php_http_message_parser_object_new(zend_class_entry *ce)
@@
-607,7
+611,7
@@
static PHP_METHOD(HttpMessageParser, parse)
ZVAL_NULL(zmsg);
if (parser_obj->parser->message) {
php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
ZVAL_NULL(zmsg);
if (parser_obj->parser->message) {
php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
- php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_
class_entry
, msg_cpy);
+ php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_
get_class_entry()
, msg_cpy);
ZVAL_OBJ(zmsg, &msg_obj->zo);
}
}
ZVAL_OBJ(zmsg, &msg_obj->zo);
}
}
@@
-627,7
+631,7
@@
static PHP_METHOD(HttpMessageParser, stream)
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &zstream, &flags, &zmsg), invalid_arg, return);
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &zstream, &flags, &zmsg), invalid_arg, return);
- zend_replace_error_handling(EH_THROW, php_http_
exception_unexpected_val_class_entry
, &zeh);
+ zend_replace_error_handling(EH_THROW, php_http_
get_exception_unexpected_val_class_entry()
, &zeh);
php_stream_from_zval(s, zstream);
zend_restore_error_handling(&zeh);
php_stream_from_zval(s, zstream);
zend_restore_error_handling(&zeh);
@@
-639,7
+643,7
@@
static PHP_METHOD(HttpMessageParser, stream)
ZVAL_NULL(zmsg);
if (parser_obj->parser->message) {
php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
ZVAL_NULL(zmsg);
if (parser_obj->parser->message) {
php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
- php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_
class_entry
, msg_cpy);
+ php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_
get_class_entry()
, msg_cpy);
ZVAL_OBJ(zmsg, &msg_obj->zo);
}
}
ZVAL_OBJ(zmsg, &msg_obj->zo);
}
}