projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests++
[m6w6/ext-http]
/
php_http_object.c
diff --git
a/php_http_object.c
b/php_http_object.c
index f85960f6acbb3cc3979f2e4a121313d1ac763642..d7f1a0f85cbfa977957df920ca130cac65eb68c2 100644
(file)
--- a/
php_http_object.c
+++ b/
php_http_object.c
@@
-98,11
+98,7
@@
zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, ph
o = ecalloc(1, sizeof(php_http_object_t));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
o = ecalloc(1, sizeof(php_http_object_t));
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;
@@
-177,7
+173,7
@@
PHP_METHOD(HttpObject, triggerError)
PHP_MINIT_FUNCTION(http_object)
{
PHP_MINIT_FUNCTION(http_object)
{
- PHP_HTTP_REGISTER_CLASS(http, Object, http_object, NULL, ZEND_ACC_
ABSTRACT
);
+ PHP_HTTP_REGISTER_CLASS(http, Object, http_object, NULL, ZEND_ACC_
EXPLICIT_ABSTRACT_CLASS
);
php_http_object_get_class_entry()->create_object = php_http_object_new;
zend_declare_property_null(php_http_object_get_class_entry(), ZEND_STRL("defaultErrorHandling"), (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC);
php_http_object_get_class_entry()->create_object = php_http_object_new;
zend_declare_property_null(php_http_object_get_class_entry(), ZEND_STRL("defaultErrorHandling"), (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC);