rpms/php/FC-3 php-4.3.11-shutdown.patch, NONE, 1.1 php.spec, 1.56, 1.57

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/php/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv30695

Modified Files:
	php.spec 
Added Files:
	php-4.3.11-shutdown.patch 
Log Message:
* Wed Apr  6 2005 Joe Orton <jorton at redhat.com> 4.3.11-2.4
- snmp: disable MSHUTDOWN function to prevent error_log noise


php-4.3.11-shutdown.patch:
 php_snmp.h |    1 -
 snmp.c     |   12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

--- NEW FILE php-4.3.11-shutdown.patch ---
--- php-4.3.11/ext/snmp/php_snmp.h.shutdown
+++ php-4.3.11/ext/snmp/php_snmp.h
@@ -39,7 +39,6 @@
 #endif
 
 PHP_MINIT_FUNCTION(snmp);
-PHP_MSHUTDOWN_FUNCTION(snmp);
 PHP_MINFO_FUNCTION(snmp);
 
 PHP_FUNCTION(snmpget);
--- php-4.3.11/ext/snmp/snmp.c.shutdown
+++ php-4.3.11/ext/snmp/snmp.c
@@ -156,7 +156,7 @@
 	"snmp",
 	snmp_functions,
 	PHP_MINIT(snmp),
-	PHP_MSHUTDOWN(snmp),
+	NULL,
 	NULL,
 	NULL,
 	PHP_MINFO(snmp),
@@ -208,16 +208,6 @@
 }
 /* }}} */
 
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(snmp)
-{
-	snmp_shutdown("snmpapp");
-
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(snmp)


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-3/php.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- php.spec	6 Apr 2005 11:12:11 -0000	1.56
+++ php.spec	6 Apr 2005 14:12:42 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 4.3.11
-Release: 2.3
+Release: 2.4
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -36,6 +36,7 @@
 Patch21: php-4.3.1-odbc.patch
 Patch22: php-4.3.2-db4.patch
 Patch24: php-4.3.8-gdnspace.patch
+Patch25: php-4.3.11-shutdown.patch
 
 # Functional changes
 Patch30: php-4.3.1-dlopen.patch
@@ -280,6 +281,7 @@
 %patch21 -p1 -b .odbc
 %patch22 -p1 -b .db4
 %patch24 -p1 -b .gdnspace
+%patch25 -p1 -b .shutdown
 
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
@@ -548,6 +550,9 @@
 %endif
 
 %changelog
+* Wed Apr  6 2005 Joe Orton <jorton at redhat.com> 4.3.11-2.4
+- snmp: disable MSHUTDOWN function to prevent error_log noise
+
 * Wed Apr  6 2005 Joe Orton <jorton at redhat.com> 4.3.11-2.3
 - really restore Net_SMTP from PEAR