Commit Graph

4004 Commits

Author SHA1 Message Date
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
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
Julien Pauli
8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Michael Wallner
8d1099ac05 duplicate value's string for the SAPI filter
reported by sesser; tyrael, do you take care of the bug/NEWS?
2014-09-09 06:54:23 +02:00
Julien Pauli
9266227402 5.5.18 now 2014-09-03 10:18:51 +02:00
Stanislav Malyshev
0c6e2b5219 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:03 -07:00
Stanislav Malyshev
70f92aa97e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
This reverts commit 53fa6c5b6b.
The change breaks tests, so not putting it into 5.4.
2014-09-02 14:15:39 -07:00
Stanislav Malyshev
63f42adbb2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:40 -07:00
Stanislav Malyshev
af85eff5b6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b Fix bug #67644 - Memory corruption & crash during ob_start function callback 2014-09-02 12:31:03 -07:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
2014-08-27 13:25:50 +01:00
Ferenc Kovacs
7ec03b481a almost forgot to bump this 2014-08-27 04:18:23 +02:00
Ferenc Kovacs
b165be9ae1 from now on, this should be 5.6.1-dev 2014-08-27 04:14:23 +02:00
Stanislav Malyshev
fae17a00f5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
2014-08-19 01:34:09 -07:00
Stanislav Malyshev
5a7039035c 5.4.32
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (Darwin)
 
 iF4EABEIAAYFAlPzCaMACgkQL3lWvF2gS10pnwD9GYeG82QTI20oVqzQ4dVF+yks
 xC5ph0RvUVXbJy8ADn4A/2Of7Q520LQYkxZHN0JDTb3EBaTvhG5sF6Yo1gTpJPKS
 =NoE4
 -----END PGP SIGNATURE-----

Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

Conflicts:
	configure.in
	main/php_version.h
2014-08-19 01:33:45 -07:00
Stanislav Malyshev
eb2360602e 5.4.32 2014-08-19 00:40:27 -07:00
Stanislav Malyshev
2b10db8e10 fix potentially missing NUL termination 2014-08-18 23:04:24 -07:00
Ferenc Kovacs
791c87ae48 Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
This reverts commit a51bf0cadf.
2014-08-06 20:33:48 +02:00
Julien Pauli
05baed522f 5.5.17 now 2014-08-06 10:20:31 +02:00
Stanislav Malyshev
65cf73c931 5.4.33-dev now 2014-08-05 21:24:55 -07:00
Stanislav Malyshev
fd28010e20 5.4.32 RC1 2014-08-05 21:03:35 -07:00
Daniel Lowrey
a51bf0cadf Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option 2014-08-05 23:13:04 -04:00
Keyur Govande
ab6c1d21f9 Undo inadvertent commit of php_version 2014-07-30 02:34:21 +00:00
Keyur Govande
65364fe7d0 Corrected patch for bug #60616
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
2014-07-30 02:28:31 +00:00
Anatol Belski
f6d941e4b4 force atoll macro usage on windows 2014-07-21 09:52:52 +02:00
Lior Kaplan
84673485f5 Enable build without atoll (e.g old AIX flavours) 2014-07-17 23:10:08 +03:00
Stanislav Malyshev
b93ea59665 5.4.31 2014-07-08 21:26:39 -07:00
Michael Wallner
deee0011e1 restore API compatibility 2014-07-03 20:40:41 +02:00
Michael Wallner
438b6c5258 finish 2014-07-03 20:40:40 +02:00
Michael Wallner
40bcd909d8 refactor php_stream_temp_create{,_ex} and use it for the php://input stream 2014-07-03 20:40:40 +02:00
Michael Wallner
11e401ab59 refactor _php_stream_fopen_{temporary_,tmp}file() 2014-07-03 20:40:40 +02:00
Michael Wallner
04c6a5b377 fix length overflow of HTTP_RAW_POST_DATA 2014-07-03 20:40:40 +02:00
Adam Harvey
82231b5d89 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:40:51 -07:00
Adam Harvey
aa3a5f7681 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:38:52 -07:00
Adam Harvey
1b9cbab9a7 Keep 308-399 HTTP response codes when header('Location:') is called.
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
2014-06-12 17:35:05 -07:00
Julien Pauli
a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Stanislav Malyshev
979eed5c6b 5.4.31 next 2014-06-10 23:03:40 -07:00
Julien Pauli
b4c92f31ad 5.5.14 now 2014-05-14 10:24:32 +02:00
Stanislav Malyshev
b1c944dfd2 5.4.30 next 2014-05-13 22:20:15 -07:00
Michael Wallner
7308d47c4b fix bug #67198 (php://input regression) 2014-05-06 12:21:43 +02:00
Anatol Belski
9280e25534 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dll export
2014-04-24 10:52:59 +02:00
Anatol Belski
acfed1c4c7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix dll export
2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398 fix dll export 2014-04-24 10:51:42 +02:00
Stanislav Malyshev
774f16318b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
2014-04-20 15:27:39 -07:00