Merge branch 'master' into phpng

diff --git a/package.xml b/package.xml
index ec9d962faec945c8283f50f9befcc6dfa8b5a6ea..f64b6250cef711613aa10b06b3ebeca0f73ec23a 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -19,9 +19,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2013-12-04</date>
+ <date>2015-07-21</date>
  <version>
-  <release>1.0.5</release>
+  <release>1.1.0</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -30,7 +30,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Source code documentation available at http://php.github.io/pecl-php-raphf
+* Fixed php module dependency check with RTLD_LAZY
++ Source code documentation available at http://m6w6.github.io/ext-raphf
 ]]></notes>
  <contents>
   <dir name="/">
@@ -60,8 +61,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </required>
  </dependencies>
  <providesextension>raphf</providesextension>
- <extsrcrelease>
-  <configureoption default="yes" name="enable-raphf" prompt="whether to enable raphf support" />
- </extsrcrelease>
+ <extsrcrelease/>
 </package>
 

diff --git a/php_raphf.h b/php_raphf.h
index c5e4f355f4bbcffe3ce6b5f65cf35f2d4b82c083..00b47a90ac57289017958fa652421106a6638834 100644 (file)
--- a/php_raphf.h
+++ b/php_raphf.h
@@ -348,7 +348,7 @@ PHP_RAPHF_API void *php_persistent_handle_accrete(
  *
  *         ops = php_persistent_handle_get_resource_factory_ops();
  *         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);
@@ -360,10 +360,24 @@ PHP_RAPHF_API void *php_persistent_handle_accrete(
 PHP_RAPHF_API php_resource_factory_ops_t *
 php_persistent_handle_get_resource_factory_ops(void);
 
+/**
+ * Create a resource factory for persistent handles.
+ *
+ * This will create a resource factory with persistent handle ops, which wraps
+ * the provided reource factory \a pf.
+ *
+ * @param a the persistent handle resource factory to initialize
+ * @param pf the resource factory to wrap
+ */
 PHP_RAPHF_API php_resource_factory_t *
 php_persistent_handle_resource_factory_init(php_resource_factory_t *a,
                php_persistent_handle_factory_t *pf);
 
+/**
+ * Check whether a resource factory is a persistent handle resource factory.
+ *
+ * @param a the resource factory to check
+ */
 PHP_RAPHF_API zend_bool php_resource_factory_is_persistent(
                php_resource_factory_t *a);