mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-03 23:05:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Browse Source
This commit is contained in:
Xinchen Hui 2013-11-05 11:03:47 +08:00
commit 2b7e89e20a
13 changed files with 741 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2013, PHP 5.4.23
?? ??? 2013, PHP 5.4.22
- Core:
@ -16,10 +18,18 @@ PHP NEWS
- FTP:
. Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
- ODBC
. Fixed bug #65950 (Field name truncation if the field name is bigger than
32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
- Sockets:
. Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
(Mike)
- Standard:
. Fixed bug #64760 (var_export() does not use full precision for floating-point
numbers) (Yasuo)
- XMLReader:
. Fixed bug #51936 (Crash with clone XMLReader). (Mike)
. Fixed bug #64230 (XMLReader does not suppress errors). (Mike)

2
configure.in
View File

@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=22
PHP_RELEASE_VERSION=23
PHP_EXTRA_VERSION="-dev"
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`

1318
ext/date/lib/timezonedb.h
View File

File diff suppressed because it is too large Load Diff

4
ext/mysqlnd/mysqlnd.c
View File

@ -527,7 +527,7 @@ mysqlnd_connect_run_authentication(
if (!auth_plugin) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The server requested authentication method unknown to the client [%s]", requested_protocol);
SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "The server requested authentication method umknown to the client");
SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "The server requested authentication method unknown to the client");
break;
}
}
@ -2162,7 +2162,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, change_user)(MYSQLND_CONN_DATA * const conn,
if (!auth_plugin) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The server requested authentication method unknown to the client [%s]", requested_protocol);
SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "The server requested authentication method umknown to the client");
SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "The server requested authentication method unknown to the client");
break;
}
}

2
ext/odbc/php_odbc_includes.h
View File

@ -232,7 +232,7 @@ typedef struct odbc_connection {
} odbc_connection;
typedef struct odbc_result_value {
char name[32];
char name[256];
char *value;
SQLLEN vallen;
SQLLEN coltype;

8
ext/standard/tests/general_functions/var_export-locale.phpt
View File

@ -784,15 +784,15 @@ string(20) "array (
Iteration 13
array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)
array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)
string(34) "array (
string(49) "array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)"

36
ext/standard/tests/general_functions/var_export_basic3.phpt
View File

@ -96,9 +96,9 @@ string(1) "0"
-- Iteration: -0.1 --
-0.1
-0.1
string(4) "-0.1"
-0.10000000000000001
-0.10000000000000001
string(20) "-0.10000000000000001"
-- Iteration: 10.0000000000000000005 --
@ -120,9 +120,9 @@ string(6) "100000"
-- Iteration: 1e-5 --
1.0E-5
1.0E-5
string(6) "1.0E-5"
1.0000000000000001E-5
1.0000000000000001E-5
string(21) "1.0000000000000001E-5"
-- Iteration: 1e+5 --
@ -144,9 +144,9 @@ string(6) "100000"
-- Iteration: 1E-5 --
1.0E-5
1.0E-5
string(6) "1.0E-5"
1.0000000000000001E-5
1.0000000000000001E-5
string(21) "1.0000000000000001E-5"
-- Iteration: .5e+7 --
@ -156,20 +156,20 @@ string(7) "5000000"
-- Iteration: .6e-19 --
6.0E-20
6.0E-20
string(7) "6.0E-20"
6.0000000000000006E-20
6.0000000000000006E-20
string(22) "6.0000000000000006E-20"
-- Iteration: .05E+44 --
5.0E+42
5.0E+42
string(7) "5.0E+42"
5.0000000000000001E+42
5.0000000000000001E+42
string(22) "5.0000000000000001E+42"
-- Iteration: .0034E-30 --
3.4E-33
3.4E-33
string(7) "3.4E-33"
3.4000000000000001E-33
3.4000000000000001E-33
string(22) "3.4000000000000001E-33"
===DONE===

10
ext/standard/tests/general_functions/var_export_basic5.phpt
View File

@ -233,15 +233,15 @@ string(20) "array (
--Iteration: array(10.5, 5.6) --
array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)
array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)
string(34) "array (
string(49) "array (
0 => 10.5,
1 => 5.6,
1 => 5.5999999999999996,
)"
@ -274,4 +274,4 @@ string(41) "array (
1 => 'test',
)"
===DONE===
===DONE===

2
ext/standard/var.c
View File

@ -436,7 +436,7 @@ PHPAPI void php_var_export_ex(zval **struc, int level, smart_str *buf TSRMLS_DC)
smart_str_append_long(buf, Z_LVAL_PP(struc));
break;
case IS_DOUBLE:
tmp_len = spprintf(&tmp_str, 0,"%.*H", (int) EG(precision), Z_DVAL_PP(struc));
tmp_len = spprintf(&tmp_str, 0,"%.*H", PG(serialize_precision), Z_DVAL_PP(struc));
smart_str_appendl(buf, tmp_str, tmp_len);
efree(tmp_str);
break;

27
ext/zip/LICENSE_libzip Normal file
View File

@ -0,0 +1,27 @@
Copyright (C) 1999-2008 Dieter Baron and Thomas Klausner
The authors can be contacted at <libzip@nih.at>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

6
main/php_version.h
View File

@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 22
#define PHP_RELEASE_VERSION 23
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.4.22-dev"
#define PHP_VERSION_ID 50422
#define PHP_VERSION "5.4.23-dev"
#define PHP_VERSION_ID 50423

1
sapi/fpm/fpm/fpm_sockets.c
View File

@ -487,6 +487,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* {{
}
if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
close(fd);
return -1;
}

16
tests/lang/bug24640.phpt
View File

@ -36,22 +36,22 @@ test(1.7e-1000);
===DONE===
<?php exit(0); ?>
--EXPECTF--
1.7E+300
1.7000000000000001E+300
float(1.7E+300)
1.7E+300
1.7E+300
------
1.7E-300
1.7000000000000001E-300
float(1.7E-300)
1.7E-300
1.7E-300
------
1.7E+79
1.7000000000000002E+79
float(1.7E+79)
1.7E+79
1.7E+79
------
1.7E-79
1.6999999999999999E-79
float(1.7E-79)
1.7E-79
1.7E-79
@ -71,7 +71,7 @@ float(1.7E+81)
1.7E+81
1.7E+81
------
1.7E-81
1.6999999999999999E-81
float(1.7E-81)
1.7E-81
1.7E-81
@ -81,7 +81,7 @@ float(I%s)
I%s
I%s
------
1.69998107421E-319
1.6999810742105611E-319
float(1.69998107421E-319)
1.69998107421E-319
1.69998107421E-319
@ -91,7 +91,7 @@ float(I%s)
I%s
I%s
------
1.70007988734E-320
1.7000798873397294E-320
float(1.70007988734E-320)
1.70007988734E-320
1.70007988734E-320
@ -101,7 +101,7 @@ float(I%s)
I%s
I%s
------
1.69958582169E-321
1.6995858216938881E-321
float(1.69958582169E-321)
1.69958582169E-321
1.69958582169E-321