|
[-]
[+]
|
Changed |
php5.changes
|
|
|
|
[-]
[+]
|
Changed |
php5.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
php-x87-fpu.patch
^
|
| @@ -1,11 +0,0 @@
---- php/php-src/branches/PHP_5_2/Zend/zend_strtod.c 2011/01/04 22:01:09 307094
-+++ php/php-src/branches/PHP_5_2/Zend/zend_strtod.c 2011/01/04 22:36:23 307095
-@@ -2035,7 +2035,7 @@
- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
- e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
- CONST char *s, *s0, *s1;
-- double aadj, aadj1, adj;
-+ volatile double aadj, aadj1, adj;
- volatile _double rv, rv0;
- Long L;
- ULong y, z;
|
|
|
Renamed |
suhosin-patch-5.2.17-0.9.7.patch.gz
^
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/NEWS
^
|
| @@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+06 Jan 2010, PHP 5.2.17
+- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
+
16 Dec 2010, PHP 5.2.16
- Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down).
(gyp at balabit dot hu)
|
|
[-]
[+]
|
Added |
php-5.2.17.tar.bz2/Zend/tests/bug53632.phpt
^
|
| @@ -0,0 +1,10 @@
+--TEST--
+zend_strtod() hangs with 2.2250738585072011e-308
+--FILE--
+<?php
+$d = 2.2250738585072011e-308;
+
+echo "Done\n";
+?>
+--EXPECTF--
+Done
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/Zend/zend_strtod.c
^
|
| @@ -89,7 +89,7 @@
* directly -- and assumed always to succeed.
*/
-/* $Id: zend_strtod.c 266327 2008-09-15 11:47:03Z dmitry $ */
+/* $Id: zend_strtod.c 307095 2011-01-04 22:36:23Z scottmac $ */
#include <zend_operators.h>
#include <zend_strtod.h>
@@ -2035,7 +2035,7 @@
int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
CONST char *s, *s0, *s1;
- double aadj, aadj1, adj;
+ volatile double aadj, aadj1, adj;
volatile _double rv, rv0;
Long L;
ULong y, z;
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/configure
^
|
| @@ -2164,7 +2164,7 @@
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=16
+PHP_RELEASE_VERSION=17
PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION`
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/configure.in
^
|
| @@ -1,4 +1,4 @@
-## $Id: configure.in 306383 2010-12-15 13:37:15Z iliaa $ -*- autoconf -*-
+## $Id: configure.in 307125 2011-01-05 14:48:13Z iliaa $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -41,7 +41,7 @@
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=16
+PHP_RELEASE_VERSION=17
PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/date/lib/unixtime2tm.c
^
|
| @@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unixtime2tm.c 293036 2010-01-03 09:23:27Z sebastian $ */
+/* $Id: unixtime2tm.c 307124 2011-01-05 14:47:27Z iliaa $ */
#include "timelib.h"
@@ -55,6 +55,12 @@
if (ts >= 0) {
tmp_days = days + 1;
+
+ if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <= -DAYS_PER_LYEAR_PERIOD) {
+ cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD);
+ tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD);
+ }
+
while (tmp_days >= DAYS_PER_LYEAR) {
cur_year++;
if (timelib_is_leap(cur_year)) {
|
|
[-]
[+]
|
Added |
php-5.2.17.tar.bz2/ext/date/tests/big_year.phpt
^
|
| @@ -0,0 +1,17 @@
+--TEST--
+Handling of large year values
+--SKIPIF--
+<?php echo PHP_INT_SIZE != 8 ? "skip 64-bit only" : "OK"; ?>
+--FILE--
+<?php
+date_default_timezone_set("America/Toronto");
+
+$t = mktime(0,0,0,1,1,292277026596);
+
+var_dump(date("r", $t));
+
+echo "OK\n";
+?>
+--EXPECT--
+string(36) "Fri, 01 Jan 219250468 00:00:00 -0500"
+OK
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_connect_params.phpt
^
|
| @@ -30,4 +30,4 @@
Warning: socket_connect(): Socket of type AF_INET requires 3 arguments in %s on line %i
-Warning: socket_connect(): unable to connect [%i]: Transport endpoint is already connected in %s on line %i
+Warning: socket_connect(): unable to connect [%i]: %a in %s on line %i
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_create_listen_used.phpt
^
|
| @@ -24,7 +24,7 @@
--EXPECTF--
resource(%i) of type (Socket)
-Warning: socket_create_listen(): unable to bind to given address [%i]: Address already in use in %s on line %i
+Warning: socket_create_listen(): unable to bind to given address [%i]: %a in %s on line %i
bool(false)
Warning: socket_close() expects parameter 1 to be resource, boolean given in %s on line %i
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_getpeername.phpt
^
|
| @@ -27,7 +27,7 @@
--EXPECTF--
bool(true)
-Warning: socket_getpeername(): unable to retrieve peer name [%i]: Transport endpoint is not connected in %s on line %i
+Warning: socket_getpeername(): unable to retrieve peer name [%i]: %a in %s on line %i
bool(false)
NULL
NULL
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_read_params.phpt
^
|
| @@ -25,4 +25,4 @@
Warning: socket_read() expects at least 2 parameters, 1 given in %s on line %i
-Warning: socket_read(): unable to read from socket [%i]: Transport endpoint is not connected in %s on line %i
+Warning: socket_read(): unable to read from socket [%i]: %a in %s on line %i
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
^
|
| @@ -44,7 +44,7 @@
socket_close($socket);
--EXPECTF--
-Warning: socket_recvfrom(): unable to recvfrom [%d]: Resource temporarily unavailable in %s on line %d
+Warning: socket_recvfrom(): unable to recvfrom [%d]: %a in %s on line %d
Warning: Wrong parameter count for socket_sendto() in %s on line %d
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_strerror.phpt
^
|
| @@ -8,6 +8,9 @@
if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
+ if (!stristr(PHP_OS, "linux") {
+ die('skip - test validtes linux error strings only.');
+ }
?>
--FILE--
<?php
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/ext/sockets/tests/socket_write_params.phpt
^
|
| @@ -25,4 +25,4 @@
Warning: socket_write() expects at least 2 parameters, 1 given in %s on line %i
-Warning: socket_write(): unable to write to socket [%i]: Broken pipe in %s on line %i
+Warning: socket_write(): unable to write to socket [%i]: %a in %s on line %i
|
|
[-]
[+]
|
Changed |
php-5.2.17.tar.bz2/main/php_version.h
^
|
| @@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 16
+#define PHP_RELEASE_VERSION 17
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.16"
-#define PHP_VERSION_ID 50216
+#define PHP_VERSION "5.2.17"
+#define PHP_VERSION_ID 50217
|
