Xinchen Hui
1c0fa36c61
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-17 11:36:15 +08:00
Xinchen Hui
66d3095993
Fixed bug #69038 (switch(SOMECONSTANT) misbehaves)
2015-02-17 11:34:57 +08:00
Felipe Pena
abbc82f448
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fix merge
BFN
2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d
- Fix merge
2015-02-16 13:09:40 -02:00
Antony Dovgal
dbf7d525a5
BFN
2015-02-16 15:23:13 +03:00
Antony Dovgal
1d94cd4bfa
Merge branch 'pull-request/995' into PHP-5.5
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731
Merge branch 'pull-request/995' into PHP-5.6
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:15:11 +03:00
redfoxli
3664345aba
fix bug #68822 (request time is reset too early)
...
this caused wrong time in the logs
2015-02-16 15:10:09 +03:00
Xinchen Hui
8309988111
Fixed bug #68912 (Segmentation fault at openssl_spki_new)
2015-02-16 14:16:52 +08:00
Xinchen Hui
423a057023
Update NEWs
2015-02-15 23:00:34 +08:00
Xinchen Hui
edd16831b1
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040
Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
2015-02-15 22:54:05 +08:00
Michael Wallner
4137956d0e
fix detection of mbstate_t with clang
...
AC_TRY_COMPILE expexts a function body
2015-02-15 09:25:03 +01:00
Xinchen Hui
1db720cd6d
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6
Fixed bug #68638 (pg_update() fails to store infinite values)
2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5
2015-02-14 22:03:53 +08:00
Yasuo Ohgaki
c0dd221a3a
Update NEWS
2015-02-14 05:41:04 +09:00
Yasuo Ohgaki
d0be36cf5b
Update NEWS
2015-02-14 05:40:51 +09:00
Yasuo Ohgaki
a54300b3f6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330
Add NULL byte protection to exec, system and passthru
2015-02-14 05:25:04 +09:00
Anatol Belski
b3d28d14d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix condition
2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b
fix condition
2015-02-13 13:39:46 +01:00
Xinchen Hui
adc4265792
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-13 13:12:44 +08:00
Xinchen Hui
3a71fa36a2
Micro opt
2015-02-13 13:09:56 +08:00
Xinchen Hui
371c016986
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2015-02-13 12:54:04 +08:00
Xinchen Hui
68ab716f18
Fixed #69015 (php-cgi's getopt does not see $argv)
...
No test script is added because of complicated
2015-02-13 12:53:34 +08:00
William Felipe Welter
0421404b73
Fixed bug #68638 pg_update() fails to store infinite values
...
Fix indent
2015-02-12 23:39:54 -02:00
Anatol Belski
d05070c98d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport gd config.w32 to support freetype 2.5
2015-02-12 20:29:24 +01:00
Anatol Belski
b5aca81de1
backport gd config.w32 to support freetype 2.5
2015-02-12 20:27:48 +01:00
Xinchen Hui
3ae88e023c
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-12 11:28:30 +08:00
Xinchen Hui
c2062ca470
Added test for #69017
2015-02-12 11:28:16 +08:00
Xinchen Hui
7062465be0
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-12 10:59:59 +08:00
Xinchen Hui
f2940b7120
Fixed bug #69017 (Fail to push to the empty array with the constant value defined in class scope)
2015-02-12 10:59:28 +08:00
Lior Kaplan
c741faf4bb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #55508 was fixed in 5.5.19 with 15ba757a
, not in 5.5.18
Add missing NEWS entry for revert of bug #41631
Add missing NEWS entry for bug #68027
Align format for bug #68799
Bug #68361 was fixed in 5.5.20 using 327d4f9a
, not in 5.5.19
Bug #55618 was fixed in 5.5.21 using eaf107c0
Add security bugs fixed in 5.5.18
Add CVE ID to bug #68676
Align email format for recent NEWS entries
2015-02-11 22:30:48 +02:00
Lior Kaplan
701a5f9de9
Add missing NEWS entry for revert of bug #41631
2015-02-11 14:02:55 +02:00
Lior Kaplan
b17e2b8214
Add CVE ID to bug #68676
2015-02-11 14:01:55 +02:00
Lior Kaplan
27d6cf4860
Align email format for recent NEWS entries
2015-02-11 14:01:16 +02:00
Lior Kaplan
e6d8bad618
Bug #55508 was fixed in 5.5.19 with 15ba757a
, not in 5.5.18
...
See https://github.com/php/php-src/pull/631#issuecomment-61969527
2015-02-11 13:20:44 +02:00
Lior Kaplan
1ebf6fba42
Add missing NEWS entry for revert of bug #41631
2015-02-11 13:15:18 +02:00
Lior Kaplan
b582aa9a44
Add missing NEWS entry for bug #68027
2015-02-11 13:13:03 +02:00
Lior Kaplan
bb16a6b2c2
Align format for bug #68799
2015-02-11 13:11:55 +02:00
Lior Kaplan
f0b329df50
Bug #68361 was fixed in 5.5.20 using 327d4f9a
, not in 5.5.19
2015-02-11 13:08:19 +02:00
Lior Kaplan
7bcf62a05b
Bug #55618 was fixed in 5.5.21 using eaf107c0
2015-02-11 13:04:32 +02:00
Lior Kaplan
0d68d0a69b
Add security bugs fixed in 5.5.18
2015-02-11 12:02:39 +02:00
Lior Kaplan
e06da17931
Add CVE ID to bug #68676
2015-02-11 12:00:19 +02:00
Lior Kaplan
e7c7788e20
Align email format for recent NEWS entries
2015-02-11 11:05:02 +02:00
Anatol Belski
4d8db154ad
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2015-02-10 16:59:22 +01:00
Anatol Belski
bc3e88b9af
fix dir separator in test
2015-02-10 16:58:59 +01:00
Ferenc Kovacs
5e1bb07701
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
oops, forgot sudo for make install
2015-02-10 11:18:34 +01:00