try to improve the graceful fix in 1.0.3

jcupitt · jcupitt · commit ed9f4243a34c · 2016-12-30T10:39:46.000Z
- only lock libvips if we're running inside apache - use the sapi error logger for the warning message - include the binary API version in the .soname also, the notes section at the top of package.xml should repeat the most recent changelog notes see libvips/php-vips#27 libvips/php-vips#28
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 vips extension changelog
 
+Version 1.0.4 (2016-12-30)
+	* Improve graceful fix from 1.0.3, see https://github.com/jcupitt/php-vips/issues/27
+	* Better notes section in package.xml, see https://github.com/jcupitt/php-vips/issues/28
+
 Version 1.0.3 (2016-12-27)
 --------------------------
 	* Lower min vips version to 8.2, see #4
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ libvips website, or build your own.
 $ pear package
 ```
 
-to make `vips-1.0.3.tgz`.
+to make `vips-1.0.4.tgz`.
 
 To install by hand:
 
diff --git a/RELEASE-1.0.4 b/RELEASE-1.0.4
diff --git a/config.h.in~ b/config.h.in~
@@ -0,0 +1,64 @@
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Whether to build vips as dynamic module */
+#undef COMPILE_DL_VIPS
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Whether you have vips */
+#undef HAVE_VIPS
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/package.xml b/package.xml
@@ -15,9 +15,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jcupitt@php.net</email>
   <active>yes</active>
  </lead>
- <date>2016-12-27</date>
+ <date>2016-12-30</date>
  <version>
-  <release>1.0.3</release>
+  <release>1.0.4</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -26,15 +26,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license filesource="LICENSE.txt">MIT</license>
  <notes>
-- First stable release.
+* Improve graceful fix from 1.0.3, see https://github.com/jcupitt/php-vips/issues/27
+* Better notes section in package.xml, see https://github.com/jcupitt/php-vips/issues/28
  </notes>
  <contents>
   <dir name="/">
    <file role='doc' name='API-1.0.0'/>
    <file role='doc' name='CREDITS'/>
    <file role='doc' name='LICENSE.txt'/>
    <file role='doc' name='README.md'/>
-   <file role='doc' name='RELEASE-1.0.3'/>
+   <file role='doc' name='RELEASE-1.0.4'/>
    <file role='doc' name='ChangeLog'/>
 
    <file role='src' name='config.m4'/>
@@ -89,6 +90,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+   <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>1.0.4</release><api>1.0.0</api></version>
+   <date>2016-12-30</date>
+   <notes>
+	* Improve graceful fix from 1.0.3, see https://github.com/jcupitt/php-vips/issues/27
+	* Better notes section in package.xml, see https://github.com/jcupitt/php-vips/issues/28
+   </notes>
+  </release>
+
    <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.3</release><api>1.0.0</api></version>
diff --git a/php_vips.h b/php_vips.h
@@ -5,7 +5,7 @@
 extern zend_module_entry vips_module_entry;
 #define phpext_vips_ptr &vips_module_entry
 
-#define PHP_VIPS_VERSION "1.0.3" 
+#define PHP_VIPS_VERSION "1.0.4" 
 
 #ifdef PHP_WIN32
 #	define PHP_VIPS_API __declspec(dllexport)
diff --git a/vips-1.0.4.tgz b/vips-1.0.4.tgz
diff --git a/vips.c b/vips.c
@@ -13,6 +13,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#include "SAPI.h"
 #include "php_vips.h"
 
 #include <vips/vips.h>
@@ -1621,21 +1622,34 @@ static void php_free_gobject(zend_resource *rsrc)
  */
 PHP_MINIT_FUNCTION(vips)
 {
-	/* "apachectl graceful" can cause us terrible problems. Within the main
-	 * apache process, it will unload this extension, which in turn will unload
-	 * libvips, since we are the only thing that references it, then reload 
-	 * again.
-	 *
-	 * Unfortunately, glib, which libvips uses, will often NOT get unloaded.
-	 * When libvips then tries to init again, it'll find left-over types like
-	 * VipsObject still registered in the system, and chaos will follow.
-	 *
-	 * A simple fix that will always work is just to lock libvips in memory and
-	 * prevent unload. 
-	 */
-	if (!dlopen("libvips.so", RTLD_LAZY | RTLD_NODELETE)) {
-		printf("php-vips-ext: unable to lock libvips -- "
-			"graceful may be unreliable\n");
+	if (strcmp(sapi_module.name, "apache2handler") == 0) {
+		/* "apachectl graceful" can cause us terrible problems. What happens:
+		 *
+		 * - the main apache process unloads this extension, vips.so
+		 * - in turn, the C runtime will unload libvips.so, the vips library,
+		 *   since vips.so is the only thing that references it
+		 * - libvips.so in turn uses glib.so, but this is often not unloaded,
+		 *   since other parts of apache can be using it (glib could also
+		 *   possibly be preventing unload itself, I'm not sure)
+		 * - the main apache process then reloads vips.so, which in turn will
+		 *   reload libvips.so as it starts up
+		 * - vips.so tries to init libvips.so
+		 * - libvips.so tries to register its types (such as VipsImage) with
+		 *   glib.so, but finds the types from the previous init still there
+		 * - everything breaks
+		 *
+		 * A simple fix that will always work is just to lock libvips in 
+		 * memory and prevent unload. We intentionally leak refs to the shared
+		 * library. 
+		 *
+		 * We include the binary API version number that this extension needs. 
+		 * We can't just load .so, that's only installed with libvips-dev, 
+		 * which may not be present at runtime.
+		 */
+		if (!dlopen("libvips.so.42", RTLD_LAZY | RTLD_NODELETE)) {
+			sapi_module.sapi_error(E_WARNING, "php-vips-ext: unable to lock "
+				"libvips -- graceful may be unreliable");
+		}
 	}
 
 	/* If you have INI entries, uncomment these lines
