Merge branch 'master' into phpng

diff --cc php_raphf.h
index c5e4f355f4bbcffe3ce6b5f65cf35f2d4b82c083,4ca7b87de8ef29434acb7a50bb46dc4b0db97707..00b47a90ac57289017958fa652421106a6638834
--- 1/php_raphf.h
--- 2/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);
   *     }