238529fc3e
Updated NEWS
2014-12-12 16:51:37 +01:00
a0d848f795
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
d43d0663af
Updated NEWS
2014-12-12 16:50:32 +01:00
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
4cda98264e
Updated NEWS
2014-12-12 16:12:52 +01:00
d5dd29ce5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
2014-12-12 16:11:26 +01:00
d6eb3b49c8
Updated NEWS
2014-12-12 15:06:04 +01:00
ee226b961c
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
2014-12-12 14:58:23 +01:00
d1a2c15221
Updated NEWS
2014-12-12 14:20:41 +01:00
895b4efab0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2014-12-12 14:18:43 +01:00
fbe9b2c088
Updated NEWS
2014-12-12 14:18:27 +01:00
b1709b8ff0
updated NEWS
2014-12-12 12:17:42 +01:00
c96ffaa653
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
2014-12-12 12:05:47 +01:00
3affc0e8a2
Fixed bug #68583 Crash in timeout thread
...
This replaces the GUI element used for execution timeout handling
on Windows. Instead a timer queue technique is used, which is indeed
a thread pool. A timer queue timer is a lightweight object handled
but that thread pool and the timer thread spends most of the time
sleeping and waiting for an alert.
Please note also that this introduces neither binary nor source
breach. The custom timeout thread functions are deleted, however
they was not exported throug DLL, so couldn't be used by any
external code. As well they couldn't be used anywhere in the core
except in executor api, because those custom timeout thread
functions they used to operate on static variables which would
be overwritten (and that would blow).
So instead a relatively modern technique is used for the timeout
handling. It's still not perfect because the executor still has to
check EX(timed_out). This can be a topic for an improvement in
master. But brobably can be tricky as currently it seems to be not
possible to signal an individual thread. Also note another issue
that static variables aren't thread safe, but the current timer
implementation is.
2014-12-12 10:43:31 +01:00
21da246807
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the test to the right place
2014-12-10 13:22:52 +01:00
c5f7dcd1dc
move the test to the right place
2014-12-10 13:19:51 +01:00
a96957f0da
updated NEWS
2014-12-10 11:49:13 +01:00
4a82cdce66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
2014-12-10 11:47:34 +01:00
20d93534d5
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-10 11:43:33 +01:00
e6f9059a86
Updated NEWS
2014-12-10 11:23:40 +01:00
9a1fc445bf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2014-12-10 11:22:46 +01:00
a67a5dc0ad
Updated NEWS
2014-12-10 11:22:28 +01:00
eda813fd37
NEWS
2014-12-10 08:19:04 +01:00
744ada7d9d
Fix bug #68526 Implement POSIX Access Control List for UDS
...
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option
Keep old behavior (chmod) if option not used or not supported.
2014-12-10 08:15:21 +01:00
9d4f4483cb
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-08 11:06:50 +00:00
4078c35939
Merge branch 'day-of-week-issues' into PHP-5.5
2014-12-08 11:06:41 +00:00
5f9a68d3ef
Fixed day_of_week function as it could sometimes return negative values internally.
2014-12-08 11:06:12 +00:00
278c38165c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:24:16 +03:00
e6ad29ae96
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
dd791cd717
Fixed possible read after end of buffer and use after free.
2014-12-08 12:18:27 +03:00
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
0854fd8b81
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-12-06 12:31:55 +01:00
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
8d79139980
updated NEWS
2014-12-06 12:00:39 +01:00
ebaf130a15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
2014-12-06 12:00:17 +01:00
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
b120f9beb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix compilation error (ref #68424 )
2014-12-06 10:24:27 +01:00
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
381fd62ccf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert unintentional docblock change
2014-12-05 13:58:19 -08:00
79131b4617
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
2014-12-05 13:57:03 -08:00
0e67973e9a
Updated NEWS
2014-12-05 17:06:16 +01:00
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
3add3491b3
Updated NEWS
2014-12-05 17:05:21 +01:00
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
a3e4b889e7
updated NEWS
2014-12-05 15:51:26 +01:00
297f582f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
2014-12-05 15:50:18 +01:00
Julien Pauli