From: Michael Wallner <mike@php.net>
Date: Tue, 21 Jul 2015 09:20:38 +0000 (+0200)
Subject: Merge branch 'master' into phpng
X-Git-Tag: release-2.0.0RC1~15
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-raphf;a=commitdiff_plain;h=6d04f5be0a7ac5ff0d6da2d167c8f1c833dcbaff

Merge branch 'master' into phpng
---

6d04f5be0a7ac5ff0d6da2d167c8f1c833dcbaff
diff --cc php_raphf.h
index c5e4f35,4ca7b87..00b47a9
--- a/php_raphf.h
+++ b/php_raphf.h
@@@ -341,15 -353,16 +341,15 @@@ PHP_RAPHF_API void *php_persistent_hand
   * {
   *     php_resource_factory_t *rf;
   *
 - *     if (persistent_id_str) {
 + *     if (persistent_id) {
   *         php_persistent_handle_factory_t *pf;
   *         php_resource_factory_ops_t *ops;
 + *         zend_string *ns = zend_string_init("my", 2, 1);
   *
   *         ops = php_persistent_handle_get_resource_factory_ops();
 - *
 - *         pf = php_persistent_handle_concede(NULL, "my", 2,
 - *             persistent_id_str, persistent_id_len, NULL, NULL TSRMLS_CC);
 - *
 + *         pf = php_persistent_handle_concede(NULL, ns, persistent_id, NULL, NULL);
-  *         rf = php_resource_factory_init(NULL, ops, pf, php_persistent_handle_abandon);
+  *         rf = php_persistent_handle_resource_factory_init(NULL, pf);
 + *         zend_string_release(ns);
   *     } else {
   *         rf = php_resource_factory_init(NULL, &myops, NULL, NULL);
   *     }