rpms/php/devel php-5.0.4-tests-dashn.patch, 1.3, 1.4 php.ini, 1.3, 1.4 php.spec, 1.116, 1.117 sources, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: jorton

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

Modified Files:
	php-5.0.4-tests-dashn.patch php.ini php.spec sources 
Log Message:
* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-9
- update to 5.1.6 (security fixes)
- bump default memory_limit to 16M (#196802)


php-5.0.4-tests-dashn.patch:
 standard/tests/file/bug26615.phpt    |    2 +-
 standard/tests/file/bug26938.phpt    |    2 +-
 standard/tests/file/proc_open01.phpt |    2 +-
 xml/tests/bug32001.phpt              |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: php-5.0.4-tests-dashn.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.0.4-tests-dashn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-5.0.4-tests-dashn.patch	29 Nov 2005 17:08:03 -0000	1.3
+++ php-5.0.4-tests-dashn.patch	29 Aug 2006 17:18:57 -0000	1.4
@@ -50,14 +50,3 @@
  print_r($out);
  ?>
  --EXPECT--
---- php-5.1.1/run-tests.php.tests-dashn
-+++ php-5.1.1/run-tests.php
-@@ -184,7 +184,7 @@
- 	settings2params($info_params);
- 	$php_info = `$php $pass_options $info_params $info_file`;
- 	@unlink($info_file);
--	define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
-+	define('TESTED_PHP_VERSION', `$php $pass_options -r 'echo PHP_VERSION;'`);
- 
- 	// check for extensions that need special handling and regenerate
- 	$php_extensions = '<?php echo join(",",get_loaded_extensions()); ?>'; 


Index: php.ini
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php.ini	3 May 2006 12:59:06 -0000	1.3
+++ php.ini	29 Aug 2006 17:18:57 -0000	1.4
@@ -311,7 +311,7 @@
 
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
+memory_limit = 16M      ; Maximum amount of memory a script may consume
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- php.spec	12 Jul 2006 07:49:01 -0000	1.116
+++ php.spec	29 Aug 2006 17:18:57 -0000	1.117
@@ -4,8 +4,8 @@
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
-Version: 5.1.4
-Release: 8.1
+Version: 5.1.6
+Release: 1
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -604,7 +604,11 @@
 %files pdo -f files.pdo
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+* Tue Aug 29 2006 Joe Orton <jorton at redhat.com> 5.1.6-9
+- update to 5.1.6 (security fixes)
+- bump default memory_limit to 16M (#196802)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.1.4-8.1
 - rebuild
 
 * Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	8 May 2006 12:18:34 -0000	1.28
+++ sources	29 Aug 2006 17:18:58 -0000	1.29
@@ -1 +1 @@
-4b7c93c9730ef7807f59732697470dad  php-5.1.4.tar.gz
+04d6166552289eaeff771f5ec953b065  php-5.1.6.tar.gz