Julien Pauli
aae9004ebd
Removed dead code
2015-08-17 17:18:25 +02:00
Julien Pauli
5f54027d04
Renamed struct member
...
<resolv.h> has a #define for _res which makes compilation
fail if included before php_output.h
2015-08-17 16:25:03 +02:00
Xinchen Hui
9834cd9339
Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""
...
This reverts commit ec1e8929c4
2015-08-11 22:34:39 +08:00
Xinchen Hui
ec1e8929c4
Revert "suggest parentheses around ‘&&’ within ‘||’"
...
This reverts commit 4f2c0e0451
2015-08-11 22:14:37 +08:00
Xinchen Hui
4f2c0e0451
suggest parentheses around ‘&&’ within ‘||’
2015-08-11 21:43:38 +08:00
Anatol Belski
7eb6bd1311
add EAGAIN checks
...
EAGAIN and EWOULDBLOCK should be checked together and don't necessary,
have same value. So checking both is better for portability.
2015-08-11 15:17:25 +02:00
Anatol Belski
24f0fe6b1f
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 14:40:34 +02:00
Christoph M. Becker
37707b2dd6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #69487 : SAPI may truncate POST data
2015-08-11 01:42:25 +02:00
Christoph M. Becker
48c71cd94b
Fix #69487 : SAPI may truncate POST data
...
If SG(request_info).request_body can't be completely written (e.g. due to a
full drive), only parts of the POST data will be available. This patch changes
this, so that SG(request_info).request_body will be reset in this case, and a
warning will be thrown.
2015-08-11 01:32:13 +02:00
Anatol Belski
3a66a23679
avoid unnecessary scoping
2015-07-31 19:09:37 +02:00
Anatol Belski
9fdb8c2ccd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:42:37 +02:00
Anatol Belski
ce5c4500cd
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:41:38 +02:00
Anatol Belski
20e765b841
Fixed bug #69900 Too long timeout on pipes
2015-07-28 10:28:45 +02:00
Bob Weinand
13525328ed
Cleanup shutdown, enable proper memory leak displaying
...
phpdbg should not memory leak...
2015-07-24 17:17:26 +02:00
Julien Pauli
3eee495570
5.6.13 now
2015-07-22 09:27:49 +02:00
Bob Weinand
348fc4d6fd
$argv and $argc may be IS_INDIRECT
2015-07-22 00:22:39 +02:00
Nikita Popov
75dc4486b2
Make s(tr)pprintf infallible
...
spprintf now always creates a buffer and strpprintf always returns
a zend_string. Previously, if the result of the format happened to
be empty, the spprintf buffer would be set to NULL and strpprintf
would return NULL.
2015-07-17 16:53:06 +02:00
Nikita Popov
c568ffe517
Ignore getcwd return in zend_compile
...
To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.
2015-07-16 22:48:56 +02:00
Julien Pauli
34b624f122
5.5.27 release
2015-07-08 16:59:44 +02:00
Anatol Belski
6f3dd4d45b
fix pipe peek timeout
2015-07-02 15:19:38 +02:00
Christoph M. Becker
58b982afed
Fix alignment on 32-bit
2015-07-02 14:23:07 +02:00
Anatol Belski
d6130fada6
fixed wrong number for the new option
2015-07-02 14:22:59 +02:00
Anatol Belski
4e5758f377
fix c/p issue
2015-07-02 14:22:58 +02:00
Anatol Belski
1a5a4d546e
add missing stuff is the header
2015-07-02 14:22:56 +02:00
Anatol Belski
734d907aa4
initial stuff to make allow blocking pipes on windows
2015-07-02 14:22:55 +02:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Bob Weinand
6ad9cd5367
Only call stream_flush if anything was written
...
This avoids flushing in readonly mode upon close
2015-06-30 03:49:54 +02:00
Dmitry Stogov
4bd22cf1c1
Improved zend_string API (Francois Laupretre)
...
Squashed commit of the following:
commit d96eab8d79francois@tekwire.net >
Date: Fri Jun 26 01:23:31 2015 +0200
Use the new 'ZSTR' macros in the rest of the code.
Does not change anything to the generated code (thanks to compat macros) but cleaner.
commit b352643910francois@tekwire.net >
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
2015-06-29 16:44:54 +03:00
Ferenc Kovacs
1efe5b1157
5.6.12 next
2015-06-25 00:21:45 +02:00
Julien Pauli
8e440dc1d7
5.5.28 now - Security Only
2015-06-24 10:41:06 +02:00
Dmitry Stogov
f0d2a0e542
Encapsulate FastCGI implementation details.
...
Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
2015-06-23 16:27:21 +03:00
Kalle Sommer Nielsen
4807b164fd
This macro is defined in zend_virtual_cwd.h, avoid redef
2015-06-22 14:02:04 +02:00
Julien Pauli
5f7c1917e3
5.5.27 now
2015-06-09 10:33:29 +02:00
Ferenc Kovacs
4d8ae36695
move to 5.6.11-dev
2015-05-28 02:05:50 +02:00
Anatol Belski
cf0397ef06
reverted 0512b38 and 1411ca5
2015-05-26 09:02:19 +02:00
Xinchen Hui
49b10ee264
Merge branch 'master' into merge-fastcgi
2015-05-26 14:17:21 +08:00
Xinchen Hui
5f753f9e2e
Micro optimizations
2015-05-26 11:47:01 +08:00
Anatol Belski
c444c4172f
further cleanups with S_IF* macros generalized declarations
2015-05-25 18:03:28 +02:00
Anatol Belski
c63467fe6e
remove non-applicable comment
2015-05-24 23:49:43 +02:00
Xinchen Hui
61f652a179
Merge branch 'master' into merge-fastcgi
2015-05-24 14:23:34 +08:00
Xinchen Hui
231f059d8c
fcgi_is_allowed should not log error
2015-05-24 14:21:04 +08:00
Anatol Belski
0512b38309
add the remaining useful symbols to the export
2015-05-23 21:00:47 +02:00
Anatol Belski
1411ca58b1
implement necessary symbol exports
2015-05-23 20:55:20 +02:00
Xinchen Hui
f20118aa66
Avoid multipy allocating of request env
2015-05-24 01:07:36 +08:00
Anatol Belski
d5f695ce7b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
increase the internal post data buffer
2015-05-23 18:47:26 +02:00
Anatol Belski
f3cec08e65
increase the internal post data buffer
...
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
2015-05-23 18:44:39 +02:00
Xinchen Hui
86de98caba
Use weak function for fcgi_log
2015-05-23 19:19:48 +08:00
Xinchen Hui
18cf4e0a8a
Fixed fpm-side (tests passes)
2015-05-23 19:01:41 +08:00
Xinchen Hui
fef18f4bea
Merge branch 'master' into merge-fastcgi
2015-05-23 10:29:45 +08:00
Xinchen Hui
ba5ecf355f
Use logger pointer
2015-05-19 16:34:08 +08:00
