rpms/php/devel php-5.0.4-tests-dashn.patch, 1.5, 1.6 php.ini, 1.6, 1.7 php.spec, 1.136, 1.137 sources, 1.31, 1.32 php-5.2.1-strreplace.patch, 1.1, NONE
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Fri May 4 10:09:30 UTC 2007
- Previous message (by thread): rpms/autodownloader/FC-6 autodownloader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/tetex/devel tetex-3.0-badscript.patch, 1.1, 1.2 tetex.spec, 1.109, 1.110
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8620
Modified Files:
php-5.0.4-tests-dashn.patch php.ini php.spec sources
Removed Files:
php-5.2.1-strreplace.patch
Log Message:
* Fri May 4 2007 Joe Orton <jorton at redhat.com> 5.2.2-2
- update to 5.2.2
- synch changes from upstream recommended php.ini
php-5.0.4-tests-dashn.patch:
Index: php-5.0.4-tests-dashn.patch
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php-5.0.4-tests-dashn.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-5.0.4-tests-dashn.patch 15 Nov 2006 11:30:55 -0000 1.5
+++ php-5.0.4-tests-dashn.patch 4 May 2007 10:08:53 -0000 1.6
@@ -6,30 +6,22 @@
- passed to run-tests.php to ensure it's passed when running each test case
- in cases where the PHP executable is run by a test case
---- php-5.2.0/Makefile.global.tests-dashn
-+++ php-5.2.0/Makefile.global
-@@ -79,7 +79,7 @@
- TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
- TEST_PHP_SRCDIR=$(top_srcdir) \
- CC="$(CC)" \
-- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
-+ $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -n $(TESTS); \
- else \
- echo "ERROR: Cannot run tests without CLI sapi."; \
- fi
---- php-5.2.0/ext/standard/tests/file/bug26938.phpt.tests-dashn
-+++ php-5.2.0/ext/standard/tests/file/bug26938.phpt
-@@ -5,7 +5,7 @@
+--- php-5.2.2/ext/standard/tests/file/bug26615.phpt.tests-dashn
++++ php-5.2.2/ext/standard/tests/file/bug26615.phpt
+@@ -7,9 +7,9 @@
$out = array();
$status = -1;
- $php = getenv('TEST_PHP_EXECUTABLE');
--exec($php . ' -r \''
-+exec($php . ' -n -r \''
- . '$lengths = array(10,20000,10000,5,10000,3);'
- . 'foreach($lengths as $length) {'
- . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
---- php-5.2.0/ext/standard/tests/file/proc_open01.phpt.tests-dashn
-+++ php-5.2.0/ext/standard/tests/file/proc_open01.phpt
+ if (substr(PHP_OS, 0, 3) != 'WIN') {
+- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
++ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+ } else {
+- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
++ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+ }
+ print_r($out);
+ ?>
+--- php-5.2.2/ext/standard/tests/file/proc_open01.phpt.tests-dashn
++++ php-5.2.2/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@
die("no php executable defined");
}
@@ -39,14 +31,33 @@
array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
$pipes
);
---- php-5.2.0/ext/standard/tests/file/bug26615.phpt.tests-dashn
-+++ php-5.2.0/ext/standard/tests/file/bug26615.phpt
-@@ -6,7 +6,7 @@
- <?php
- $out = array();
+--- php-5.2.2/ext/standard/tests/file/bug26938.phpt.tests-dashn
++++ php-5.2.2/ext/standard/tests/file/bug26938.phpt
+@@ -6,14 +6,14 @@
$status = -1;
--exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
-+exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
- print_r($out);
- ?>
- --EXPECT--
+ $php = getenv('TEST_PHP_EXECUTABLE');
+ if (substr(PHP_OS, 0, 3) != 'WIN') {
+- exec($php . ' -r \''
++ exec($php . ' -n -r \''
+ . '$lengths = array(10,20000,10000,5,10000,3);'
+ . 'foreach($lengths as $length) {'
+ . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
+ . ' print "\n";'
+ . '}\'', $out, $status);
+ } else {
+- exec($php . ' -r "'
++ exec($php . ' -n -r "'
+ . '$lengths = array(10,20000,10000,5,10000,3);'
+ . 'foreach($lengths as $length) {'
+ . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
+--- php-5.2.2/Makefile.global.tests-dashn
++++ php-5.2.2/Makefile.global
+@@ -79,7 +79,7 @@
+ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+ TEST_PHP_SRCDIR=$(top_srcdir) \
+ CC="$(CC)" \
+- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
++ $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -n $(TESTS); \
+ else \
+ echo "ERROR: Cannot run tests without CLI sapi."; \
+ fi
Index: php.ini
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php.ini 8 Feb 2007 11:46:11 -0000 1.6
+++ php.ini 4 May 2007 10:08:53 -0000 1.7
@@ -655,9 +655,15 @@
;xmlrpc_errors = 0
[Pcre]
-;pcre.recursion_limit=100000
+;PCRE library backtracking limit.
;pcre.backtrack_limit=100000
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
+;stack size limit imposed by the Operating System).
+;pcre.recursion_limit=100000
+
[Syslog]
; Whether or not to define the various syslog variables (e.g. $LOG_PID,
; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- php.spec 29 Mar 2007 11:33:05 -0000 1.136
+++ php.spec 4 May 2007 10:08:53 -0000 1.137
@@ -5,8 +5,8 @@
Summary: The PHP HTML-embedded scripting language
Name: php
-Version: 5.2.1
-Release: 5
+Version: 5.2.2
+Release: 2
License: The PHP License v3.01
Group: Development/Languages
URL: http://www.php.net/
@@ -21,7 +21,6 @@
Patch3: php-5.0.4-norpath.patch
Patch5: php-5.0.2-phpize64.patch
Patch8: php-5.2.0-includedir.patch
-Patch9: php-5.2.1-strreplace.patch
# Fixes for extension modules
Patch21: php-4.3.1-odbc.patch
@@ -296,7 +295,6 @@
%patch3 -p1 -b .norpath
%patch5 -p1 -b .phpize64
%patch8 -p1 -b .includedir
-%patch9 -p1 -b .strreplace
%patch21 -p1 -b .odbc
%patch22 -p1 -b .shutdown
@@ -633,6 +631,10 @@
%files pdo -f files.pdo
%changelog
+* Fri May 4 2007 Joe Orton <jorton at redhat.com> 5.2.2-2
+- update to 5.2.2
+- synch changes from upstream recommended php.ini
+
* Thu Mar 29 2007 Joe Orton <jorton at redhat.com> 5.2.1-5
- enable SASL support in LDAP extension (#205772)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 16 Feb 2007 12:50:14 -0000 1.31
+++ sources 4 May 2007 10:08:53 -0000 1.32
@@ -1,2 +1 @@
-52d7e8b3d8d7573e75c97340f131f988 php-5.2.0.tar.gz
-604eaee2b834bb037d2c83e53e300d3f php-5.2.1.tar.gz
+7a920d0096900b2b962b21dc5c55fe3c php-5.2.2.tar.gz
--- php-5.2.1-strreplace.patch DELETED ---
- Previous message (by thread): rpms/autodownloader/FC-6 autodownloader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/tetex/devel tetex-3.0-badscript.patch, 1.1, 1.2 tetex.spec, 1.109, 1.110
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list