From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 16 Dec 2007 17:14:54 +0000 (+0000)
Subject: MFB: Fixed bug #43606 (define missing depencies of the exif extension)
X-Git-Tag: php-5.2.6RC1~241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc859da75004d94b62156755f2aa8aeb249f0bb;p=php

MFB: Fixed bug #43606 (define missing depencies of the exif extension)
---

diff --git a/NEWS b/NEWS
index 9779af9071..75f52201e0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2008, PHP 5.2.6
 - Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
 
+- Fixed bug #43606 (define missing depencies of the exif extension)
+  (crrodriguez at suse dot de)
 - Fixed bug #43580 (removed bogus declaration of a non-existent php_is_url()  
   function). (Ilia)
 - Fixed bug #43533 (escapeshellarg('') returns null). (Ilia)
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index cd6e3b5277..7c5e6089bc 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -241,12 +241,21 @@ PHP_MSHUTDOWN_FUNCTION(exif)
 }
 /* }}} */
 
+/* {{{ exif dependencies */
+static const zend_module_dep exif_module_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	#if EXIF_USE_MBSTRING
+	ZEND_MOD_REQUIRED("mbstring")
+	#endif
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
 /* {{{ exif_module_entry
  */
 zend_module_entry exif_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
-	STANDARD_MODULE_HEADER,
-#endif
+	STANDARD_MODULE_HEADER_EX, NULL,
+	exif_module_deps,
 	"exif",
 	exif_functions,
 	PHP_MINIT(exif),