projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
re-implement params serializer
[m6w6/ext-http]
/
php_http_encoding.c
diff --git
a/php_http_encoding.c
b/php_http_encoding.c
index c84c30981277d7f478a83e2330da97a88dfb555b..a1667fc0fdc645be68540c69cf75fc670ccdb40e 100644
(file)
--- a/
php_http_encoding.c
+++ b/
php_http_encoding.c
@@
-959,11
+959,7
@@
zend_object_value php_http_encoding_stream_object_new_ex(zend_class_entry *ce, p
o = ecalloc(1, sizeof(*o));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
o = ecalloc(1, sizeof(*o));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
-#if PHP_VERSION_ID < 50339
- zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*));
-#else
object_properties_init((zend_object *) o, ce);
object_properties_init((zend_object *) o, ce);
-#endif
if (ptr) {
*ptr = o;
if (ptr) {
*ptr = o;
@@
-1065,7
+1061,11
@@
PHP_METHOD(HttpEncodingStream, flush)
size_t encoded_len;
if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) {
size_t encoded_len;
if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) {
- RETURN_STRINGL(encoded_str, encoded_len, 0);
+ if (encoded_str) {
+ RETURN_STRINGL(encoded_str, encoded_len, 0);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
}
}
}
}
}