Skip to content

More tests pass now #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 4, 2015
Prev Previous commit
Next Next commit
minor cleanup
  • Loading branch information
rlerdorf committed Feb 3, 2015
commit 3a93af390d0430dcae00b860b65e8ec5eddf82e9
8 changes: 2 additions & 6 deletions php_memcached.c
Original file line number Diff line number Diff line change
Expand Up @@ -2861,12 +2861,8 @@ zend_object_value php_memc_server_new(zend_class_entry *ce)
zval *tmp;

intern = ecalloc(1, sizeof(php_memc_server_t));
zend_object_std_init (&intern->zo, ce);
#if PHP_VERSION_ID >= 50400
object_properties_init( (zend_object *) intern, ce);
#else
zend_hash_copy(intern->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
#endif
zend_object_std_init(&intern->zo, ce);
object_properties_init(&intern->zo, ce);

intern->handler = php_memc_proto_handler_new ();

Expand Down