302ccc195b
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
...
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=8a8dfaec
2014-08-28 00:37:01 +03:00
30a73658c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 16:01:18 +01:00
32be79dcfa
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2014-08-27 13:25:50 +01:00
7fac56e072
fixed DBG_INF macro name
2014-08-27 12:10:35 +02:00
1e1b7c74fb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:37 +02:00
52f35b984c
update the GIT-RULES with the 5.6 and the release branches
2014-08-27 00:47:09 +02:00
f463523cda
Update NEWS
2014-08-25 19:47:35 +02:00
640214701c
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
2014-08-25 17:28:09 +02:00
c8b3bce407
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk >
2014-08-25 00:30:01 +03:00
bda1cc6946
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:29:05 +03:00
a90d05a430
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
this test depends on the simplexml ext, not just on xml
2014-08-24 00:09:00 +02:00
cb41a7bad1
this test depends on the simplexml ext, not just on xml
2014-08-24 00:08:09 +02:00
c4fb183b9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #67865
2014-08-21 22:43:25 +02:00
54fbbded37
fix bug #67865
2014-08-21 22:41:36 +02:00
dbbf1c2a3c
updated NEWS to fit last release
2014-08-21 11:34:38 +02:00
43ed561222
NEWS
2014-08-21 09:14:16 +02:00
e9166fec62
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:16 +02:00
713e9a7eaa
avoid clash when stdint.h was included after win32/php_stdint.h
2014-08-21 09:08:44 +02:00
6da2a977fc
fix test
2014-08-20 14:44:25 -07:00
825ddbb3c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
2014-08-20 15:17:05 +02:00
9185cfd539
NEWS
2014-08-20 15:16:53 +02:00
6d19358ae0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed variable corruption under win x64
2014-08-20 15:10:02 +02:00
20941b71aa
fixed variable corruption under win x64
2014-08-20 15:08:52 +02:00
d382d6f3dc
Add NEWS entry for bug #67492
...
Included in 5.5.14 with commit d9c5a1d
2014-08-20 01:10:38 +03:00
9360b6eeee
Add NEWS entry for bug #67730
2014-08-20 01:05:22 +03:00
aa6dc6c108
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:01:23 +03:00
276bead9c4
Add NEWS entry for bug #67730
...
Included in 5.4.32 with commit 706aefb
2014-08-20 00:54:19 +03:00
359bc0ee2f
Add CVE ID for bug #67539
2014-08-20 00:51:37 +03:00
ac4569621d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
2014-08-19 13:17:56 -07:00
cbe1597b74
Switch use of strtok() to gd_strtok_r()
...
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.
I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
2014-08-19 13:16:44 -07:00
b278be894f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:09 -07:00
5a7039035c
Merge tag 'PHP-5.4.32' into PHP-5.4
...
5.4.32
* tag 'PHP-5.4.32':
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Conflicts:
configure.in
main/php_version.h
2014-08-19 01:33:45 -07:00
eb2360602e
5.4.32
2014-08-19 00:40:27 -07:00
335d89ec4d
NEWS
2014-08-19 08:40:58 +02:00
5e9e0a2c74
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
2014-08-19 08:40:30 +02:00
88c48a4b95
NEWS
2014-08-19 08:40:18 +02:00
2fefae4771
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
...
Incomplete fix for CVE-2014-4049
Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
2014-08-19 08:33:49 +02:00
2b10db8e10
fix potentially missing NUL termination
2014-08-18 23:04:24 -07:00
706aefb781
Fix bug #67730 - Null byte injection possible with imagexxx functions
2014-08-18 22:49:10 -07:00
529da0f74c
Fixed bug #67717 - segfault in dns_get_record
2014-08-18 22:37:25 -07:00
299d8f339f
Merge branch 'datetimebugs' into PHP-5.5
2014-08-18 20:27:33 +01:00
05d1612e16
BFN.
2014-08-18 18:46:56 +01:00
36d05d75c8
Fixed bug #67109 : First uppercase letter breaks date string parsing.
2014-08-18 18:41:50 +01:00
2b9af967fb
Fixed bug #66985 : Some timezones are no longer valid in PHP 5.5.10.
2014-08-18 18:41:50 +01:00
fac08a960b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Correct typo in comments: 'initialized'
2014-08-17 21:33:41 +03:00
1504f7d630
Correct typo in comments: 'initialized'
2014-08-17 21:32:53 +03:00
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
6279246d2c
Update NEWS
2014-08-15 23:38:14 +00:00
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
Lior Kaplan