Dmitry Stogov
cc4c318b0c
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:04:47 +04:00
Remi Collet
e7ce002c01
revert
2013-02-05 12:28:47 +01:00
Remi Collet
6533094d9e
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
On x86_64:
(long)(double)9223372036854775807+1 = -9223372036854775808
On ppc64
(long)(double)9223372036854775807-1 = 9223372036854775807
2013-02-04 15:19:32 +01:00
Andrey Hristov
740b823be8
check the validity of the parameter
2013-02-04 14:27:56 +01:00
Andrey Hristov
643ce95b5b
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-02-04 14:15:58 +01:00
Gustavo Lopes
0110662ae9
Move macro back to .c file
...
Because it depends on a static function on that .c file.
2013-02-02 18:32:38 +01:00
Gustavo Lopes
73de4d8c68
Merge branch 'sockets_54_improv' into PHP-5.4
...
* sockets_54_improv:
Fix wrong blocking state being set
Fix tests (Windows)
Remove a Windows only warning
Move & improve PHP_SOCKET_ERROR def
Move some declarations to sockets.c
Fix overbroad skipif include
2013-02-02 15:31:44 +01:00
Gustavo Lopes
ac6342bbc0
Fix wrong blocking state being set
2013-02-02 15:29:18 +01:00
Gustavo Lopes
40663ede83
Fix tests (Windows)
2013-02-02 15:29:18 +01:00
Gustavo Lopes
24e380f970
Remove a Windows only warning
2013-02-02 15:29:18 +01:00
Gustavo Lopes
9283b8aea4
Move & improve PHP_SOCKET_ERROR def
2013-02-02 15:29:11 +01:00
Gustavo Lopes
97d656fc82
Move some declarations to sockets.c
2013-02-02 14:06:23 +01:00
Gustavo Lopes
a100c25ea4
Fix overbroad skipif include
2013-02-02 14:06:23 +01:00
Remi Collet
0cea9e6843
Fixed bug #64128 buit-in web server is broken on ppc64.
...
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
2013-02-01 19:23:25 +01:00
Andrey Hristov
f45a85c386
add new charset, from MySQL 5.6
2013-02-01 17:21:50 +01:00
Johannes Schlüter
b09f5a4f56
Fix typo in error message
2013-02-01 12:31:07 +01:00
Remi Collet
9d75bf35e9
Mark this test as requiring internet connecion.
2013-01-31 14:38:39 +01:00
Remi Collet
f7362232f4
Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18)
...
old: Stale NFS file handle
new: Stale file handle
2013-01-31 14:22:56 +01:00
Johannes Schlüter
9d6636364d
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-01-31 00:58:52 +01:00
Johannes Schlüter
a80fdc47b3
This will be PHP 5.3.23
2013-01-31 00:57:29 +01:00
Lars Strojny
836a2b1131
NEWS entry new OpenSSL option [doc]
2013-01-31 00:32:44 +01:00
Daniel Lowrey
4a01ddfb55
Added ssl context option, "disable_compression"
...
The CRIME attack vector exploits TLS compression. This patch adds a stream context option
allowing servers to disable TLS compression for versions of OpenSSL >= 1.0.0 (which first
introduced the SSL_OP_NO_COMPRESSION option). A summary rundown of the CRIME attack can
be found at https://community.qualys.com/blogs/securitylabs/2012/09/14/crime-information-leakage-attack-against-ssltls
Thanks to @DaveRandom for pointing out the relevant section of code.
2013-01-31 00:31:10 +01:00
Nikita Popov
bb4d11b405
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-30 20:25:59 +01:00
Nikita Popov
321f4f18e5
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:23:39 +01:00
Jelle Zijlstra
31468401b7
Fix build problem in C++11
2013-01-30 19:07:52 +01:00
Stanislav Malyshev
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
Stanislav Malyshev
7a6e76fd2f
update NEWS
2013-01-29 12:31:49 -08:00
Johannes Schlüter
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
Johannes Schlüter
264279439b
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-29 19:49:39 +01:00
Johannes Schlüter
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
Johannes Schlüter
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
Stanislav Malyshev
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
Andras Elso
3e6d633a0d
Fix missing parameter
2013-01-27 17:11:14 -08:00
Stanislav Malyshev
122570443b
fix tests
2013-01-23 10:44:53 -08:00
Gustavo Lopes
38bf6951b3
NEWS for bug #64023 (see aa0adce
)
2013-01-23 13:30:40 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Xinchen Hui
86c1a26169
Merge fix of #62836 to ?.re, and regenerate ?.c
2013-01-21 11:35:22 +08:00
Stanislav Malyshev
9e7c2e5906
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:35:09 -08:00
Stanislav Malyshev
33b104c778
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:29:43 -08:00
Gustavo Lopes
b69fd9c9b8
NEWS for bug #64011 . See 77ee200
2013-01-18 12:12:08 +01:00
Gustavo Lopes
77ee200097
Fix bug #64011 (get_html_translation_table())
...
get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
2013-01-18 12:10:27 +01:00
Johannes Schlüter
a85ae16e74
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-16 17:38:41 +01:00
Johannes Schlüter
be2f547497
Fix NEWS after 5.3.21
2013-01-16 17:38:17 +01:00
Christopher Jones
94a4e0f823
Fix News
2013-01-15 20:38:24 -08:00
Adam Harvey
142c40f32c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:18:00 +08:00
Adam Harvey
f63a9f6c11
Update the arguments in the prototype of fpm_socket_unix_test_connect().
...
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
2013-01-16 10:06:56 +08:00
Anatoliy Belsky
9498cf6194
fixed build
2013-01-15 22:36:29 +01:00
Gustavo Lopes
4c38003dbd
NEWS for bug #63893
2013-01-15 21:07:21 +01:00
Gustavo Lopes
93e35137aa
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4
...
* remotes/cataphract/strtr_wu94_54:
Fixed inconsequential bug in strtr()
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:05:21 +01:00