Adam Harvey
|
8c59ae345e
|
Move the mime type map out of php_cli_server.c for easier generation.
|
2014-06-11 00:18:33 +00:00 |
|
Adam Harvey
|
faa34f24e3
|
Replace the CLI server's linear search for extensions with a hash table.
This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
|
2014-06-10 23:57:42 +00:00 |
|
Dmitry Stogov
|
592c8a0426
|
Improved conditions order
|
2014-06-11 02:46:50 +04:00 |
|
Stanislav Malyshev
|
ac6c86b7dc
|
fix test
|
2014-06-10 14:25:49 -07:00 |
|
Xinchen Hui
|
d461afc3a2
|
Merge branch 'PHP-5.6'
|
2014-06-10 21:58:31 +08:00 |
|
Xinchen Hui
|
ebe6854dbc
|
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_execute_API.c
|
2014-06-10 21:58:16 +08:00 |
|
Xinchen Hui
|
e8699d75da
|
Remove unused included file
|
2014-06-10 21:56:30 +08:00 |
|
Xinchen Hui
|
3c69140a90
|
Remove unused codes
|
2014-06-10 21:53:46 +08:00 |
|
Remi Collet
|
0b6676ef87
|
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
|
2014-06-10 14:36:38 +02:00 |
|
Remi Collet
|
e72ab79196
|
NEWS
|
2014-06-10 14:36:31 +02:00 |
|
Remi Collet
|
0a7e131128
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
|
2014-06-10 14:36:02 +02:00 |
|
Remi Collet
|
a4d709afe2
|
NEWS
|
2014-06-10 14:35:57 +02:00 |
|
Remi Collet
|
12a62ce868
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
|
2014-06-10 14:35:23 +02:00 |
|
Remi Collet
|
6256b79a35
|
NEWS
|
2014-06-10 14:35:14 +02:00 |
|
Remi Collet
|
25b1dc917a
|
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Upstream:
93e063ee37
Adapted for C standard.
|
2014-06-10 14:33:37 +02:00 |
|
Remi Collet
|
ed28d84b9a
|
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
|
2014-06-10 14:24:28 +02:00 |
|
Remi Collet
|
fde5790fd6
|
NEWS
|
2014-06-10 14:24:22 +02:00 |
|
Remi Collet
|
9ee147e6ff
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
|
2014-06-10 14:24:07 +02:00 |
|
Remi Collet
|
20b03c84ec
|
NEWS
|
2014-06-10 14:24:00 +02:00 |
|
Remi Collet
|
ff66c90af0
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
|
2014-06-10 14:23:37 +02:00 |
|
Remi Collet
|
da5d40bae6
|
NEWS
|
2014-06-10 14:23:31 +02:00 |
|
Remi Collet
|
40ef6e07e0
|
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Upstream:
40bade80cb
|
2014-06-10 14:22:04 +02:00 |
|
Remi Collet
|
59383273eb
|
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
|
2014-06-10 14:17:06 +02:00 |
|
Remi Collet
|
b999947dcd
|
NEWS
|
2014-06-10 14:16:58 +02:00 |
|
Remi Collet
|
1d6286c049
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
|
2014-06-10 14:16:39 +02:00 |
|
Remi Collet
|
9d0ca077ee
|
NEWS
|
2014-06-10 14:16:32 +02:00 |
|
Remi Collet
|
f6fee381be
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
|
2014-06-10 14:16:07 +02:00 |
|
Remi Collet
|
2b33a41162
|
NEWS
|
2014-06-10 14:16:00 +02:00 |
|
Remi Collet
|
5c9f967999
|
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
Upstream:
36fadd2984
|
2014-06-10 14:13:14 +02:00 |
|
Remi Collet
|
8cd184f14a
|
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
|
2014-06-10 14:05:44 +02:00 |
|
Remi Collet
|
7f8fa470f1
|
NEWS
|
2014-06-10 14:05:34 +02:00 |
|
Remi Collet
|
5e7cb43890
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
|
2014-06-10 14:05:02 +02:00 |
|
Remi Collet
|
da399ce6a8
|
NEWS
|
2014-06-10 14:04:52 +02:00 |
|
Remi Collet
|
18ff81eb1a
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
|
2014-06-10 14:04:36 +02:00 |
|
Remi Collet
|
d02aa44090
|
NEWS
|
2014-06-10 14:04:27 +02:00 |
|
Remi Collet
|
e77659a8c8
|
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
Upstream
27a14bc7ba
|
2014-06-10 14:02:36 +02:00 |
|
Remi Collet
|
39885d0819
|
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
|
2014-06-10 10:39:10 +02:00 |
|
Remi Collet
|
e2493a3a08
|
fix merge from php 5.5 (already fixed, differently)
|
2014-06-10 10:38:39 +02:00 |
|
Remi Collet
|
d440bb3e68
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
|
2014-06-10 10:32:26 +02:00 |
|
Remi Collet
|
95fcf868d3
|
NEWS
|
2014-06-10 10:32:15 +02:00 |
|
Remi Collet
|
949cab09f2
|
NEWS
|
2014-06-10 10:31:17 +02:00 |
|
Remi Collet
|
58c6a08e00
|
Fixed bug #67406 built-in web-server segfaults on startup
Reproduce on aarch64.
From select man page:
"select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
|
2014-06-10 10:28:34 +02:00 |
|
Dmitry Stogov
|
eb9b0baaa9
|
Optimized for fast path
|
2014-06-10 01:58:28 +04:00 |
|
Dmitry Stogov
|
15ba03fc80
|
Avoid repeatable zend_is_autogolobal() calls
|
2014-06-10 00:16:18 +04:00 |
|
Dmitry Stogov
|
7c045c61f0
|
Optimized for fast path
|
2014-06-10 00:15:44 +04:00 |
|
Dmitry Stogov
|
9a9bb8877e
|
Improved ZTS support
|
2014-06-09 21:29:20 +04:00 |
|
Dmitry Stogov
|
371345bed6
|
Avoid reallocation
|
2014-06-09 17:36:37 +04:00 |
|
Ferenc Kovacs
|
ab074b408a
|
Merge branch 'PHP-5.6'
* PHP-5.6:
enable phpdbg for the travis build, and also run the testsuite for it
|
2014-06-09 15:30:49 +02:00 |
|
Ferenc Kovacs
|
5ec5c80dc4
|
enable phpdbg for the travis build, and also run the testsuite for it
|
2014-06-09 15:30:09 +02:00 |
|
Dmitry Stogov
|
2d29f2d8d9
|
Comparison optimization
|
2014-06-09 17:00:22 +04:00 |
|