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
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
a80fdc47b3
This will be PHP 5.3.23
2013-01-31 00:57:29 +01:00
836a2b1131
NEWS entry new OpenSSL option [doc]
2013-01-31 00:32:44 +01:00
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
bb4d11b405
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-30 20:25:59 +01:00
321f4f18e5
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:23:39 +01:00
31468401b7
Fix build problem in C++11
2013-01-30 19:07:52 +01:00
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
7a6e76fd2f
update NEWS
2013-01-29 12:31:49 -08:00
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
264279439b
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-29 19:49:39 +01:00
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
3e6d633a0d
Fix missing parameter
2013-01-27 17:11:14 -08:00
122570443b
fix tests
2013-01-23 10:44:53 -08:00
38bf6951b3
NEWS for bug #64023 (see aa0adce)
2013-01-23 13:30:40 +01:00
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
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
86c1a26169
Merge fix of #62836 to ?.re, and regenerate ?.c
2013-01-21 11:35:22 +08:00
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
33b104c778
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:29:43 -08:00
b69fd9c9b8
NEWS for bug #64011 . See 77ee200
2013-01-18 12:12:08 +01:00
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
a85ae16e74
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-16 17:38:41 +01:00
be2f547497
Fix NEWS after 5.3.21
2013-01-16 17:38:17 +01:00
94a4e0f823
Fix News
2013-01-15 20:38:24 -08:00
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
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
9498cf6194
fixed build
2013-01-15 22:36:29 +01:00
4c38003dbd
NEWS for bug #63893
2013-01-15 21:07:21 +01:00
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
930ef9ddd6
Fixed inconsequential bug in strtr()
2013-01-15 17:25:59 +01:00
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474
2013-01-15 17:37:21 +08:00
b1bf524140
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "Update fputcsv() to escape all characters equally."
2013-01-15 17:35:34 +08:00
c077074c13
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805
2013-01-15 17:33:54 +08:00
374ebc8741
fix NEWS
2013-01-15 00:08:12 -08:00
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
a4191b0aad
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update fputcsv() to escape all characters equally.
2013-01-15 15:24:21 +08:00
9b5cb0e805
Update fputcsv() to escape all characters equally.
...
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
2013-01-15 15:17:45 +08:00
6a065876b9
Bug #52958 : Segfault in PDO_OCI on cleanup after running a long testsuite.
2013-01-14 21:35:48 +01:00
bf9ad4e661
Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
2013-01-14 18:52:38 +01:00
1e9a3ed234
Fix bug #63916 : PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
2013-01-14 17:59:11 +01:00
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
d7bac4f5ba
Remove _GNU_SOURCE, add local heap sort
2013-01-14 17:06:52 +01:00
e5029ac40b
The compiler can figure this out
2013-01-14 12:22:42 +01:00
93d1171c47
Remove unused block
2013-01-14 12:22:42 +01:00
Remi Collet