|
[-]
[+]
|
Changed |
php5.changes
|
|
|
|
[-]
[+]
|
Changed |
php5.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
php-5.3.0-bnc536631.patch
^
|
| @@ -1,20 +0,0 @@
-Index: ext/standard/mail.c
-===================================================================
---- ext/standard/mail.c (revisión: 282503)
-+++ ext/standard/mail.c (revisión: 282504)
-@@ -241,7 +241,7 @@
- php_basename(tmp, strlen(tmp), NULL, 0,&f, &f_len TSRMLS_CC);
-
- if (headers != NULL) {
-- spprintf(&hdr, 0, "%s\r\nX-PHP-Originating-Script: %ld:%s\n", headers, php_getuid(), f);
-+ spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\r\n%s", php_getuid(), f, headers);
- } else {
- spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(), f);
- }
-
-Cambios de propiedades en ext/standard/mail.c
-___________________________________________________________________
-Modificado: cvs2svn:cvs-rev
- - 1.87.2.1.2.7.2.10
- + 1.87.2.1.2.7.2.11
-
|
|
[-]
[+]
|
Deleted |
php-5.3.0-curl_code_10.patch
^
|
| @@ -1,14 +0,0 @@
-Index: ext/curl/interface.c
-===================================================================
---- ext/curl/interface.c (revisión: 284216)
-+++ ext/curl/interface.c (revisión: 284217)
-@@ -781,6 +781,9 @@
-
- #if LIBCURL_VERSION_NUM >= 0x070f01
- REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
-+#endif
-+
-+#if LIBCURL_VERSION_NUM >= 0x071001
- REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
- REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
- REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
|
|
[-]
[+]
|
Deleted |
php-5.3.0-ini.patch
^
|
| @@ -1,47 +0,0 @@
-Index: php.ini-production
-===================================================================
---- php.ini-production.orig 2009-06-28 19:56:18.000000000 +0200
-+++ php.ini-production 2009-08-16 19:54:14.000000000 +0200
-@@ -1186,7 +1186,7 @@ mysql.allow_local_infile = On
-
- ; Allow or prevent persistent links.
- ; http://php.net/mysql.allow-persistent
--mysql.allow_persistent = On
-+mysql.allow_persistent = Off
-
- ; If mysqlnd is used: Number of cache slots for the internal result set cache
- ; http://php.net/mysql.cache_size
-@@ -1249,7 +1249,7 @@ mysqli.max_persistent = -1
-
- ; Allow or prevent persistent links.
- ; http://php.net/mysqli.allow-persistent
--mysqli.allow_persistent = On
-+mysqli.allow_persistent = Off
-
- ; Maximum number of links. -1 means no limit.
- ; http://php.net/mysqli.max-links
-@@ -1587,12 +1587,12 @@ session.referer_check =
-
- ; How many bytes to read from the file.
- ; http://php.net/session.entropy-length
--session.entropy_length = 0
-+session.entropy_length = 16
-
- ; Specified here to create the session id.
- ; http://php.net/session.entropy-file
--;session.entropy_file = /dev/urandom
--session.entropy_file =
-+session.entropy_file = /dev/urandom
-+;session.entropy_file =
-
- ; http://php.net/session.entropy-length
- ;session.entropy_length = 16
-@@ -1623,7 +1623,7 @@ session.use_trans_sid = 0
- ; 0 (MD5 128 bits)
- ; 1 (SHA-1 160 bits)
- ; http://php.net/session.hash-function
--session.hash_function = 0
-+session.hash_function = 1
-
- ; Define how many bits are stored in each character when converting
- ; the binary hash data to something readable.
|
|
[-]
[+]
|
Deleted |
php-5.3.0-open_basedir-borked.patch
^
|
| @@ -1,13 +0,0 @@
-Index: main/fopen_wrappers.c
-===================================================================
---- main/fopen_wrappers.c (revisión: 286601)
-+++ main/fopen_wrappers.c (revisión: 286602)
-@@ -93,7 +93,7 @@
-
- p = (char **) (base + (size_t) mh_arg1);
-
-- if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
-+ if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
- /* We're in a PHP_INI_SYSTEM context, no restrictions */
- *p = new_value;
- return SUCCESS;
|
|
[-]
[+]
|
Deleted |
php-x87-fpu.patch
^
|
| @@ -1,11 +0,0 @@
---- php/php-src/branches/PHP_5_3/Zend/zend_strtod.c 2011/01/04 22:01:09 307094
-+++ php/php-src/branches/PHP_5_3/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;
|
|
[-]
[+]
|
Deleted |
php5-really-with-libedit.patch
^
|
| @@ -1,68 +0,0 @@
-Index: ext/readline/config.m4
-===================================================================
-RCS file: /repository/php-src/ext/readline/config.m4,v
-retrieving revision 1.25.2.3
-diff -u -r1.25.2.3 config.m4
---- ext/readline/config.m4 28 Nov 2005 23:04:01 -0000 1.25.2.3
-+++ ext/readline/config.m4 17 Aug 2006 22:46:53 -0000
-@@ -64,7 +64,7 @@
- elif test "$PHP_LIBEDIT" != "no"; then
-
- for i in $PHP_LIBEDIT /usr/local /usr; do
-- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
- done
-
- if test -z "$LIBEDIT_DIR"; then
-Index: ext/readline/readline.c
-===================================================================
-RCS file: /repository/php-src/ext/readline/readline.c,v
-retrieving revision 1.42.2.3
-diff -u -r1.42.2.3 readline.c
---- ext/readline/readline.c 1 Jan 2006 12:50:12 -0000 1.42.2.3
-+++ ext/readline/readline.c 17 Aug 2006 22:46:53 -0000
-@@ -33,9 +33,11 @@
- #define rl_completion_matches completion_matches
- #endif
-
-+#if HAVE_LIBREADLINE
- #include <readline/readline.h>
--#ifndef HAVE_LIBEDIT
- #include <readline/history.h>
-+#else
-+#include <editline/readline.h>
- #endif
-
- PHP_FUNCTION(readline);
-Index: sapi/cli/php_cli.c
-===================================================================
-RCS file: /repository/php-src/sapi/cli/php_cli.c,v
-retrieving revision 1.129.2.13.2.6
-diff -u -r1.129.2.13.2.6 php_cli.c
---- sapi/cli/php_cli.c 27 Jun 2006 08:27:10 -0000 1.129.2.13.2.6
-+++ sapi/cli/php_cli.c 17 Aug 2006 22:47:10 -0000
-@@ -76,7 +76,7 @@
- #endif
-
- #if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
--#include <readline/readline.h>
-+#include <editline/readline.h>
- #if !HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
-Index: sapi/cli/php_cli_readline.c
-===================================================================
-RCS file: /repository/php-src/sapi/cli/php_cli_readline.c,v
-retrieving revision 1.3.2.5
-diff -u -r1.3.2.5 php_cli_readline.c
---- sapi/cli/php_cli_readline.c 1 Jan 2006 12:50:19 -0000 1.3.2.5
-+++ sapi/cli/php_cli_readline.c 17 Aug 2006 22:47:10 -0000
-@@ -49,7 +49,7 @@
- #include <unixlib/local.h>
- #endif
-
--#include <readline/readline.h>
-+#include <editline/readline.h>
- #if !HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.24-return-non-void.patch
^
|
| @@ -1,13 +0,0 @@
-Index: execute.c
-===================================================================
---- execute.c.orig 2008-05-10 18:01:22.000000000 +0200
-+++ execute.c 2008-06-10 09:03:38.000000000 +0200
-@@ -1042,7 +1042,7 @@ static int ih_function_exists(IH_HANDLER
- int func_name_len;
-
- if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
-- ZEND_WRONG_PARAM_COUNT();
-+ ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(1);
- }
- convert_to_string_ex(function_name);
- func_name_len = Z_STRLEN_PP(function_name);
|
|
[-]
[+]
|
Deleted |
suhosin-0.9.29-retval.patch
^
|
| @@ -1,24 +0,0 @@
-Index: ext/suhosin/execute.c
-===================================================================
---- ext/suhosin/execute.c.orig 2009-08-15 10:59:55.000000000 -0400
-+++ ext/suhosin/execute.c 2009-08-23 16:57:40.000000000 -0400
-@@ -1446,7 +1446,8 @@ static int ih_mt_rand(IH_HANDLER_PARAMS)
- RAND_RANGE(number, min, max, PHP_MT_RAND_MAX);
- }
-
-- RETURN_LONG(number);
-+ RETVAL_LONG(number);
-+ return (0);
- }
-
- static int ih_rand(IH_HANDLER_PARAMS)
-@@ -1469,7 +1470,8 @@ static int ih_rand(IH_HANDLER_PARAMS)
- RAND_RANGE(number, min, max, PHP_MT_RAND_MAX);
- }
-
-- RETURN_LONG(number);
-+ RETVAL_LONG(number);
-+ return(0);
- }
-
- static int ih_getrandmax(IH_HANDLER_PARAMS)
|
|
|
Renamed |
suhosin-patch-5.3.5-0.9.10.patch.gz
^
|
|
[-]
[+]
|
Changed |
php-5.3.5.tar.bz2/NEWS
^
|
| @@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+06 Jan 2011, PHP 5.3.5
+- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
+
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
- Upgraded bundled PCRE to version 8.10. (Ilia)
|
|
[-]
[+]
|
Added |
php-5.3.5.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.3.5.tar.bz2/Zend/zend_language_scanner.c
^
|
| @@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Dec 8 22:47:02 2010 */
+/* Generated by re2c 0.13.5 on Wed Jan 5 17:41:40 2011 */
/*
+----------------------------------------------------------------------+
| Zend Engine |
|
|
[-]
[+]
|
Changed |
php-5.3.5.tar.bz2/Zend/zend_language_scanner_defs.h
^
|
| @@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Dec 8 22:47:02 2010 */
+/* Generated by re2c 0.13.5 on Wed Jan 5 17:41:40 2011 */
enum YYCONDTYPE {
yycST_IN_SCRIPTING,
|
|
[-]
[+]
|
Changed |
php-5.3.5.tar.bz2/Zend/zend_strtod.c
^
|
| @@ -89,7 +89,7 @@
* directly -- and assumed always to succeed.
*/
-/* $Id: zend_strtod.c 277398 2009-03-18 10:18:10Z dmitry $ */
+/* $Id: zend_strtod.c 307119 2011-01-05 13:32:26Z johannes $ */
#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.3.5.tar.bz2/configure
^
|
| @@ -2168,7 +2168,7 @@
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=4
+PHP_RELEASE_VERSION=5
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.3.5.tar.bz2/configure.in
^
|
| @@ -1,4 +1,4 @@
-## $Id: configure.in 306090 2010-12-08 21:38:51Z johannes $ -*- autoconf -*-
+## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- 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=3
-PHP_RELEASE_VERSION=4
+PHP_RELEASE_VERSION=5
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.3.5.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 307131 2011-01-05 15:34:34Z johannes $ */
#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.3.5.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.3.5.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 3
-#define PHP_RELEASE_VERSION 4
+#define PHP_RELEASE_VERSION 5
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.3.4"
-#define PHP_VERSION_ID 50304
+#define PHP_VERSION "5.3.5"
+#define PHP_VERSION_ID 50305
|
