Dmitry Stogov
50cbd7f4ce
Optimize out useles paths
2014-06-16 21:49:46 +04:00
Dmitry Stogov
bd10db271c
Use new zend_hash iteration API
2014-06-16 21:11:52 +04:00
Dmitry Stogov
e181798405
Small call/return improvement
2014-06-16 13:25:23 +04:00
Dmitry Stogov
3b2fb7abc5
Fixed support for references
2014-06-16 13:08:48 +04:00
Xinchen Hui
17b98b6379
Refactoring imap (in progress)
2014-06-16 14:59:03 +08:00
Dmitry Stogov
83817ddb1c
Fixed reference counting
2014-06-12 13:01:44 +04:00
Dmitry Stogov
dd1c68e67f
Merge branch 'master' into phpng
...
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
2014-06-12 05:07:33 +04:00
Dmitry Stogov
593b125eb9
Fixed reference handling
2014-06-12 03:14:57 +04:00
Adam Harvey
b853f99abf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
5.5.15 now
2014-06-11 21:44:07 +00:00
Adam Harvey
af26a28ac0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
5.5.15 now
Conflicts:
configure.in
main/php_version.h
2014-06-11 21:43:39 +00:00
Adam Harvey
16e0dcea72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS entry for "Fix potential segfault in dns_get_record()"
2014-06-11 21:42:26 +00:00
Sara Golemon
1ba338624b
NEWS entry for Fix potential segfault in dns_get_record()
2014-06-11 14:24:50 -07:00
Sara Golemon
5f2a30e111
NEWS entry for "Fix potential segfault in dns_get_record()"
2014-06-11 14:24:13 -07:00
Sara Golemon
ace35a3d3b
NEWS entry for Fix potential segfault in dns_get_record(
2014-06-11 14:22:59 -07:00
Dmitry Stogov
edb064e2ee
Fixed call to mysqli_init() from an object. (We should find some better fix)
2014-06-12 00:57:10 +04:00
Sara Golemon
b34d7849ed
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix potential segfault in dns_get_record()
2014-06-11 13:53:59 -07:00
Sara Golemon
e2ef56f760
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix potential segfault in dns_get_record()
2014-06-11 13:51:53 -07:00
Sara Golemon
1978f41c8a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix potential segfault in dns_get_record()
2014-06-11 13:37:40 -07:00
Sara Golemon
4f73394fdd
Fix potential segfault in dns_get_record()
...
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
2014-06-11 13:37:04 -07:00
Dmitry Stogov
bccd4184a5
Fixed error messages
2014-06-12 00:33:43 +04:00
Ferenc Kovacs
ec974c4397
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Add optional second arg to unserialize()"
2014-06-11 14:59:39 +02:00
Ferenc Kovacs
c38ab260fe
Revert "Add optional second arg to unserialize()"
...
This reverts commit cfd1045822
2014-06-11 14:43:09 +02:00
Dmitry Stogov
9f6db414f8
Improved assignment code
2014-06-11 15:11:29 +04:00
Julien Pauli
a6e0751079
5.5.15 now
2014-06-11 10:21:26 +02:00
Dmitry Stogov
14e6ee7f42
Use absolute addresses as branch targets for NEW, FE_RESET and FE_FETCH
2014-06-11 11:39:42 +04:00
Stanislav Malyshev
6953d33d30
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
2014-06-10 23:25:01 -07:00
Stanislav Malyshev
ff74b9b2fc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
2014-06-10 23:24:36 -07:00
Stanislav Malyshev
495e6719e0
update NEWS
2014-06-10 23:23:37 -07:00
Stanislav Malyshev
6c81b14b2d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
2014-06-10 23:21:17 -07:00
Stanislav Malyshev
2ed66ed21c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
2014-06-10 23:20:07 -07:00
Stanislav Malyshev
f11bba4929
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
2014-06-10 23:19:21 -07:00
Stanislav Malyshev
317bcb96d0
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-06-10 23:17:30 -07:00
Stanislav Malyshev
979eed5c6b
5.4.31 next
2014-06-10 23:03:40 -07:00
Adam Harvey
61279dca69
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
2014-06-11 00:31:04 +00:00
Adam Harvey
f79f3ac184
Fix broken test.
2014-06-11 00:22:13 +00:00
Adam Harvey
c12f832479
Add a mime type map generation script and update the header.
2014-06-11 00:19:49 +00:00
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
