Xinchen Hui
a620b79040
Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
2015-02-15 22:54:05 +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
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
5ff77b005b
fix condition
2015-02-13 13:39:46 +01: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
b5aca81de1
backport gd config.w32 to support freetype 2.5
2015-02-12 20:27:48 +01:00
Xinchen Hui
c2062ca470
Added test for #69017
2015-02-12 11:28:16 +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
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
bc3e88b9af
fix dir separator in test
2015-02-10 16:58:59 +01:00
Ferenc Kovacs
bf9fb65001
oops, forgot sudo for make install
2015-02-10 11:18:19 +01:00
Ferenc Kovacs
a8d001aedf
add make install
2015-02-10 10:34:52 +01:00
William Felipe Welter
60d5cdf137
Fixed bug #68638 pg_update() fails to store infinite values
...
Check if value is "infinity" with strcasestr() to add quotes
2015-02-09 20:35:18 -02:00
Daniel Lowrey
f2b12424c0
NEWS
2015-02-09 11:42:40 -05:00
Daniel Lowrey
1eef4f2a0c
Miscellaneous cleanup
2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85
Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5
2015-02-09 11:40:04 -05:00
Xinchen Hui
d078c59ed9
Merge branch 'improve-bug67436' of https://github.com/reeze/php-src into PHP-5.5
2015-02-09 11:31:59 +08:00
Bob Weinand
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
George Wang
c892127f76
Fixed #68790 (Missing return)
2015-02-07 12:18:42 -05:00
George Wang
5e3f0f5671
Fixed #68790 (Missing return)
2015-02-07 12:16:54 -05:00
Reeze Xia
4d034b1a1e
Improve tests for bug 67436
...
I always use a.php or b.php for local testing,
this diff makes the test more stable
2015-02-07 14:11:09 +08:00
William Felipe Welter
bb3a81c4b4
Fixed bug #68638 pg_update() fails to store infinite values.
...
Add quotes only if "infinity" values are received.
2015-02-07 01:26:12 -02:00
Anatol Belski
9bf95d8291
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:14 +01:00
Anatol Belski
f4319a4f73
updated NEWS
2015-02-06 19:37:01 +01:00
Anatol Belski
a41aa46759
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
...
This is done in two steps:
- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
Server 9, otherwise the client will not recognize several SQL
datatypes
- additionally the config scripts was tweaked so then ODBCVER
can be overridden, that still allows enabling compatibility
with lower versions
Bug #67437 might be fixed by this as well.
2015-02-06 19:00:27 +01:00
Anatol Belski
9ef0c39b2b
Removed erroneous condition
...
This condition is always false. Furthermore headers_list() is
documented to always return an array.
2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08
fix tests
2015-02-05 21:54:47 -08:00
Stanislav Malyshev
067340bbc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update header handling to RFC 7230
2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073
Update header handling to RFC 7230
2015-02-05 20:08:12 -08:00
William Felipe Welter
b64f149176
Test case Bug #68638 pg_update() fails to store infinite values
2015-02-05 13:19:52 -02:00
Stanislav Malyshev
10b15f0f8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Conflicts: main/streams/memory.c
2015-02-05 00:41:35 -08:00
Nayana Hettiarachchi
5446377c6b
Conflicts:
...
main/streams/memory.c
2015-02-05 16:32:30 +08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Julien Pauli
959cecf046
Updated NEWS
2015-02-04 17:43:36 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
.
2015-02-04 17:39:16 +01:00
Julien Pauli
b86529f751
5.5.23 now
2015-02-04 16:35:32 +01:00