Dmitry Stogov
5c63a4f72b
Micro optimization for the most frequency case
2014-10-03 12:18:15 +04:00
Sara Golemon
1fab968a90
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add hash to EXTENSIONS file
2014-10-02 18:55:39 -07:00
Sara Golemon
f41a7b926a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add hash to EXTENSIONS file
2014-10-02 18:55:29 -07:00
Sara Golemon
2cf94189a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add hash to EXTENSIONS file
2014-10-02 18:55:14 -07:00
Sara Golemon
4e7b31a0db
Add hash to EXTENSIONS file
2014-10-02 18:54:46 -07:00
Johannes Schlüter
1721bbedab
Remove extensions which are long gone
2014-10-03 02:12:09 +02:00
Ferenc Kovacs
26c5143a7f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
we also have xz release tarballs since 5.5
5.5.19 now
2014-10-02 22:33:10 +02:00
Ferenc Kovacs
7a529790b2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
we also have xz release tarballs since 5.5
5.5.19 now
Conflicts:
configure.in
main/php_version.h
2014-10-02 22:32:18 +02:00
Ferenc Kovacs
d7b01aff89
we also have xz release tarballs since 5.5
2014-10-02 22:28:19 +02:00
Nikita Popov
51c90e999f
Fix ZTS build
2014-10-02 21:58:29 +02:00
Anatol Belski
c41fbcfb4c
improved file size computation in stat()
...
On 32 bit it's still overwlowing, so nothing is changed there. But
the usage of LARGE_INTEGER instead of bit shifting is a better way
to go.
2014-10-02 12:18:02 +02:00
Dmitry Stogov
ccb24caa6d
Fixed incorrect compilation
2014-10-02 13:37:44 +04:00
Julien Pauli
cfe8a8b968
5.5.19 now
2014-10-01 16:16:05 +02:00
Dmitry Stogov
c4419e7a5b
Expose zend_throw_exception_internal()
2014-10-01 16:37:21 +04:00
Dmitry Stogov
8857af8494
Use inline finction for OBJ_RELEASE() macro
2014-10-01 16:35:56 +04:00
Ferenc Kovacs
d1cfc0b899
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS about the release date of 5.6.1
2014-10-01 11:16:40 +02:00
Ferenc Kovacs
26f4e40622
update NEWS about the release date of 5.6.1
2014-10-01 11:15:59 +02:00
Remi Collet
26a5627cc6
only no_NO.ISO-8859-1 have to be ignored (merged)
2014-10-01 10:15:13 +02:00
Remi Collet
3e6f176733
only no_NO.ISO-8859-1 have to be ignored
2014-10-01 10:14:14 +02:00
krakjoe
7cbd8f8b8a
remove bogus locale use from test
2014-10-01 10:12:06 +02:00
Remi Collet
bd8d73ff45
Merge branch 'PHP-5.6'
...
* PHP-5.6:
use $PHP_LIBDIR instread of "lib" in skel example
2014-10-01 09:27:18 +02:00
Remi Collet
f584b67eaa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
use $PHP_LIBDIR instread of "lib" in skel example
2014-10-01 09:26:46 +02:00
Remi Collet
7319298ffe
use $PHP_LIBDIR instread of "lib" in skel example
2014-10-01 09:26:21 +02:00
Dmitry Stogov
9f7564b12b
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
2014-10-01 10:46:13 +04:00
Dmitry Stogov
63dc9bbc02
Micro optimization
2014-09-30 15:19:51 +04:00
Nikita Popov
67a11b61cd
Drop unused INIT_STRING opcode
...
INIT_STRING has been implemented as an UNUSED op1 to ADD_* for
some time now.
2014-09-29 22:59:57 +02:00
Nikita Popov
290d71de75
Drop unused RAISE_ABSTRACT_ERROR opcode
...
Abstract methods are being prevented from being called in DO_FCALL
etc.
2014-09-29 22:50:56 +02:00
Nikita Popov
ab288b01d5
CT substitute unqualified true/false/null in namespaces
...
Substituation now always happens on the resolved name and
unqualified usages of true/false/null in namespaced code are
substituted as well.
2014-09-29 21:18:12 +02:00
Nikita Popov
142a01db92
Fix a couple compile warnings
2014-09-29 20:57:17 +02:00
Anatol Belski
e46187daf5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test filename
2014-09-29 20:31:02 +02:00
Anatol Belski
df4d559881
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test filename
2014-09-29 20:30:43 +02:00
Anatol Belski
7f1239232e
fix test filename
2014-09-29 20:30:18 +02:00
Anatol Belski
a81a392117
Merge branch 'PHP-5.6'
...
* PHP-5.6:
one more test to illustrate transfer of an arbitrary data amount throug pipes
2014-09-29 20:19:51 +02:00
Anatol Belski
cc3849f039
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more test to illustrate transfer of an arbitrary data amount throug pipes
2014-09-29 20:19:31 +02:00
Anatol Belski
1a2a8c6d4e
one more test to illustrate transfer of an arbitrary data amount throug pipes
2014-09-29 20:18:33 +02:00
Anatol Belski
6090c3cf83
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix tests on linux
better test cleanup
2014-09-29 18:13:16 +02:00
Anatol Belski
70ff3ad7d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests on linux
better test cleanup
2014-09-29 18:12:56 +02:00
Anatol Belski
859913f6d4
fix tests on linux
2014-09-29 18:12:25 +02:00
Anatol Belski
91d3cd8559
better test cleanup
...
and even force the XFAIL to fail as it would take too long anyway, even if it passes
2014-09-29 18:11:06 +02:00
Dmitry Stogov
e15be6c8cd
Use more readable inline functions
2014-09-29 19:41:00 +04:00
Anatol Belski
b428dc761d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
increase the polling period to not to break existing behaviours
2014-09-29 17:29:00 +02:00
Anatol Belski
231a311ecb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
increase the polling period to not to break existing behaviours
2014-09-29 17:28:27 +02:00
Anatol Belski
46aa2c396b
increase the polling period to not to break existing behaviours
2014-09-29 17:27:24 +02:00
Anatol Belski
78e23758b7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #51800 proc_open on Windows hangs forever
Conflicts:
main/streams/plain_wrapper.c
2014-09-29 16:30:40 +02:00
Anatol Belski
7e16bb263f
updated NEWS
2014-09-29 16:28:12 +02:00
Anatol Belski
87a37f4090
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #51800 proc_open on Windows hangs forever
2014-09-29 16:27:33 +02:00
Anatol Belski
0c982798e0
Fixed bug #51800 proc_open on Windows hangs forever
...
This loop can block for some minutes, theoretically. Practially
however, this is a 99% non issue for a normal use case. This is
required because read() is synchronous. The PHP streams API wants
to fill its internal buffers, therefore it might try to read some
more data than user has demanded. Also, for a case where we want
to read X bytes, but neither enough data nor EOF arrives, read()
will block until it could fill the buffer. If a counterpart station
runs slowly or delivers not all the data at once, read() would
still be waiting. If we quit too early, we possibly could loose
some data from the pipe. Thus it has to emulate the read()
behaviour, but obviously not completely, just to some grade.
Reading big data amount is for sure an issue on any platforms, it
depends on the pipe buffer size, which is controlled by the system.
On Windows, the buffer size seems to be way too small, which causes
buffer congestion and a dead lock. It is essential to read the pipe
descriptors simultaneously and possibly in the same order as the
opposite writes them.
Thus, this will work with smaller buffer data sizes passed through
pipes. As MSDN states, anonymous pipes don't support asynchronous
operations. Neither anonymous pipes do support select() as they are
not SOCKETs but file descriptors. Consequently - bigger data sizes
will need a better solution based on threads. However it is much
more expencive. Maybe a better solution could be exporting a part
of the internal doing as a userspace function which could perform
some kind of lookahead operation on the pipe descriptor.
This is just the first stone, depending on the user feedback we
might go for further improvements in this area.
2014-09-29 16:24:34 +02:00
Xinchen Hui
f248b17e07
Fixed segfault
2014-09-29 12:06:56 +08:00
Stanislav Malyshev
3fd8a76f26
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Set an LDAP error code when failing ldap_bind due to null bytes
Conflicts:
ext/ldap/ldap.c
2014-09-28 12:28:30 -07:00
Stanislav Malyshev
a8e84b1b21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:49 -07:00