Commit Graph

3779 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
aee85bc163 - Oops committed old version of the patch in r324020. Fixed. See bug #61253. 2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
b976ebad35 - Oops committed old version of the patch in r324020. Fixed. See bug #61253. 2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
0169020e49 - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
7166298d63 - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
f413b3726c - Fixed bug #61253: Wrappers opened with errors concurrency problem
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
Stanislav Malyshev
4cc747677c MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. 2012-03-07 07:49:56 +00:00
Gustavo André dos Santos Lopes
02592974b4 - size_t may be shorter than long and definitely is not signed. Note that the
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
Gustavo André dos Santos Lopes
3e6bc8fbce - size_t may be shorter than long and definitely is not signed. Note that the
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
Gustavo André dos Santos Lopes
32c5643f6b - size_t may be shorter than long and definitely is not signed. Note that the
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
Pierre Joye
94994104a5 - bump minimum version, no more XP/2003 2012-03-04 15:08:12 +00:00
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
5525d80982 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
67db5de6b2 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
f465b219b5 Fix bug #61106 Segfault when using header_register_callback
The callback was double dtored
2012-03-02 08:04:51 +00:00
Nikita Popov
09f24e0850 Fix bug #61106 Segfault when using header_register_callback
The callback was double dtored
2012-03-02 08:04:51 +00:00
Xinchen Hui
2e5e82a8ca MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars) 2012-03-02 03:18:04 +00:00
Rasmus Lerdorf
02f6937073 Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR 2012-03-01 22:49:03 +00:00
Rasmus Lerdorf
995a668eab Merge fix for bug 61193 2012-03-01 22:34:23 +00:00
Stanislav Malyshev
23c62eb080 back to dev 2012-02-29 07:24:27 +00:00
Stanislav Malyshev
bfd72d0386 5.4.0 2012-02-29 07:22:43 +00:00
Rasmus Lerdorf
99c70829a0 Fix bug 61193 2012-02-27 12:16:39 +00:00
Rasmus Lerdorf
4ac6c512f9 Fix bug 61193 2012-02-27 12:16:39 +00:00
Gustavo André dos Santos Lopes
bcefc31e68 - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
911330e62c - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
cde7662226 - Fixed bug #61115 (stream related segfault on fatal error in
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
2012-02-22 11:45:26 +00:00
Gustavo André dos Santos Lopes
eb1ada852d - Fixed bug #61115 (stream related segfault on fatal error in
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
2012-02-22 11:45:26 +00:00
Gustavo André dos Santos Lopes
fc134965c8 - Revert r134029. The streams pooling API was never used in more
than 8 years and therefore unnecessarily adds complexity.
2012-02-21 21:55:00 +00:00
Rasmus Lerdorf
8bc24c0046 I think we should let this be settable from .htaccess to match the other post/upload
related limits like upload_max_filesize, post_max_size, and max_input_vars.
2012-02-17 17:54:11 +00:00
Stanislav Malyshev
6561d47e55 back to dev 2012-02-16 07:47:02 +00:00
Stanislav Malyshev
c1d415f798 5.4.0rc8 2012-02-16 07:45:08 +00:00
Stanislav Malyshev
dab17da38a make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Stanislav Malyshev
fa9540e1f1 make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Michael Wallner
7a58d9f679 fix compat function not passing along input buffer with php_output_context_pass() if the output_handler_func does not set out_str 2012-02-14 19:31:54 +00:00
Michael Wallner
685a3c86c2 fix compat function not passing along input buffer with php_output_context_pass() if the output_handler_func does not set out_str 2012-02-14 19:31:54 +00:00
Mateusz Kocielski
ddcf55b640 * fixed bug #60704 unlink() bug with some files path
Reviewed by: rasmus@
2012-02-14 14:14:30 +00:00
Mateusz Kocielski
4d600bda70 * fixed bug #60704 unlink() bug with some files path
Reviewed by: rasmus@
2012-02-14 14:14:30 +00:00
Dmitry Stogov
282d3f2034 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Dmitry Stogov
04f6171012 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Dmitry Stogov
2ad7f44b7b Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Xinchen Hui
3f23b11151 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Xinchen Hui
6672171672 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Rasmus Lerdorf
0f6e3408db Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
704c45ec3e Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
0f0261e0b7 Fix for bug 60986 2012-02-06 18:11:56 +00:00
Gustavo André dos Santos Lopes
024e1307c6 - Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and
forbid \0. See bug #60227.
2012-02-03 13:56:37 +00:00
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +00:00
Gustavo André dos Santos Lopes
f906a015bb - Hopefully correct fix for bug #60227.
#No commit for 5.4 for now
2012-02-02 18:24:53 +00:00
Stanislav Malyshev
9e9683b6b0 back to dev 2012-02-02 17:29:00 +00:00
Stanislav Malyshev
29e2f050f5 retag 5.4.0 rc7 2012-02-02 17:28:03 +00:00
Johannes Schlüter
1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Dmitry Stogov
29a909edcc Fixed memory leaks 2012-02-02 10:26:53 +00:00
Dmitry Stogov
cc1829d187 Fixed memory leaks 2012-02-02 10:26:53 +00:00
Dmitry Stogov
89bc5ece51 Fixed memory leaks 2012-02-02 10:26:53 +00:00
Stanislav Malyshev
3a95557cc3 back to dev 2012-02-02 06:09:50 +00:00
Stanislav Malyshev
9e9d6d3aaf 5.4.0 rc7 2012-02-02 06:08:29 +00:00
Stanislav Malyshev
4558f06648 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Stanislav Malyshev
40d8cd1f12 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Stanislav Malyshev
9cb8f3ad48 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
2012-01-31 09:58:26 +00:00
Michael Wallner
29c8658dc8 fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by 2012-01-31 08:51:24 +00:00
Michael Wallner
3c03829429 use stderr before, stdout after php_output_startup() and sapi_module.ub_write() after php_output_activate()
- fixes Bug #60920  CLI: php -v on STDERR
- fixes Bug #60923  Failing tests for sapi/cli
2012-01-30 12:17:51 +00:00
Michael Wallner
9de5b6dc7c use stderr before, stdout after php_output_startup() and sapi_module.ub_write() after php_output_activate()
- fixes Bug #60920  CLI: php -v on STDERR
- fixes Bug #60923  Failing tests for sapi/cli
2012-01-30 12:17:51 +00:00
Michael Wallner
bfccc4ed58 fix crash with display_startup_errors=1 2012-01-25 17:22:46 +00:00
Michael Wallner
ef388d1f28 fix crash with display_startup_errors=1 2012-01-25 17:22:46 +00:00
Gustavo André dos Santos Lopes
45a6f8d9a5 - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
#withheld commit to 5.4
2012-01-22 20:30:37 +00:00
Gustavo André dos Santos Lopes
f5a4573182 - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
#withheld commit to 5.4
2012-01-22 20:30:37 +00:00
Stanislav Malyshev
cbdfc93154 back to dev 2012-01-19 06:29:15 +00:00
Stanislav Malyshev
44c773120e 5.4.0RC6 2012-01-19 06:27:56 +00:00
Dmitry Stogov
ccd1b15bd0 Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Dmitry Stogov
d940f2d38a Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Dmitry Stogov
9025d6219d Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Michael Wallner
6b31413b13 Fix bug #60768 Output buffer not discarded
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
2012-01-16 17:51:35 +00:00
Michael Wallner
f32760bd40 Fix bug #60768 Output buffer not discarded
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
2012-01-16 17:51:35 +00:00
Johannes Schlüter
93ee94adb6 We should be back to -dev ... 2012-01-15 19:51:36 +00:00
Rui Hirokawa
61088ce729 MFH: fixed bug #60227: header() cannot detect the multi-line header with CR. 2012-01-14 07:41:01 +00:00
Johannes Schlüter
c7904620d1 - Fix version number as used in Windows builds for 5.3.9 2012-01-10 13:27:39 +00:00
Johannes Schlüter
3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00
Patrick Allaert
b1721549dd Changed: restoring REQUEST_TIME as a long, introducing REQUEST_TIME_FLOAT instead as discussed on the ML 2012-01-06 13:38:06 +00:00
Patrick Allaert
a4305214a3 Changed: restoring REQUEST_TIME as a long, introducing REQUEST_TIME_FLOAT instead as discussed on the ML 2012-01-06 13:37:51 +00:00
Stanislav Malyshev
64a9019171 back to dev 2012-01-05 07:24:26 +00:00
Stanislav Malyshev
6cb0b66053 5.4.0rc5 2012-01-05 07:22:29 +00:00
Stanislav Malyshev
7c3177e5ab fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Stanislav Malyshev
2a687aed1a fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Michael Wallner
db51b6b84b follow naming convention 2011-12-30 09:20:07 +00:00
Michael Wallner
ecfb3af78f follow naming convention 2011-12-30 09:20:07 +00:00
Dmitry Stogov
8de2aa24b6 Added an API call to return active output handler 2011-12-30 08:50:49 +00:00
Dmitry Stogov
f7942c9e63 Added an API call to return active output handler 2011-12-30 08:50:49 +00:00
Stanislav Malyshev
63e5f97da4 fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Stanislav Malyshev
87b9f7bb3a fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Dmitry Stogov
ce52784052 Initialize structure (some fields may be missed in array returned from user handler). 2011-12-22 15:33:48 +00:00
Dmitry Stogov
0e563dfa93 Initialize structure (some fields may be missed in array returned from user handler). 2011-12-22 15:33:48 +00:00
Dmitry Stogov
3f5f5eefe5 Initialize structure (some fields may be missed in array returned from user handler). 2011-12-22 15:33:48 +00:00
Dmitry Stogov
8dad134ad7 Change fatal error into warning and ignore arguments over limit 2011-12-22 15:31:41 +00:00
Dmitry Stogov
cef0d27af9 Change fatal error into warning and ignore arguments over limit 2011-12-22 15:31:41 +00:00
Dmitry Stogov
3305f5b133 Change fatal error into warning and ignore arguments over limit 2011-12-22 15:31:41 +00:00
Johannes Schlüter
af07705f97 Back to -dev 2011-12-22 12:36:40 +00:00
Johannes Schlüter
712be66d05 PHP 5.3.9RC4 2011-12-22 12:33:04 +00:00
Stanislav Malyshev
48a688ffa0 back to dev 2011-12-22 03:27:00 +00:00
Stanislav Malyshev
1a79692791 5.4.0rc4 2011-12-22 03:25:28 +00:00
Dmitry Stogov
0d1998e34f Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 08:47:03 +00:00
Dmitry Stogov
6fb3897f80 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-14 08:56:35 +00:00
Dmitry Stogov
4ffedc700d Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-14 08:56:35 +00:00
Gustavo André dos Santos Lopes
74d2b2f0bd - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together
with the last read.
2011-12-11 21:08:15 +00:00
Gustavo André dos Santos Lopes
faec3c5111 - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together
with the last read.
2011-12-11 21:08:15 +00:00
Gustavo André dos Santos Lopes
52c36e60c4 - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together
with the last read.
2011-12-11 21:08:15 +00:00
Johannes Schlüter
451263f7d0 - Back to -dev 2011-12-08 13:46:45 +00:00
Johannes Schlüter
4307bd57db - 5.3.9RC3 2011-12-08 11:01:37 +00:00
Stanislav Malyshev
8559b09566 back to dev 2011-12-08 07:17:27 +00:00
Stanislav Malyshev
00f2a9b2ba 5.4.0rc3 2011-12-08 07:15:44 +00:00
Xinchen Hui
b5766cdcac Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
5aa1fb6074 Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
0420858004 Merge -r317306 to trunk 2011-12-07 10:28:56 +00:00
Derick Rethans
45ae82d3f1 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00
Derick Rethans
9e6bf9f3f4 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00
Derick Rethans
0244e76c06 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00
Johannes Schlüter
fb573462ca - Back to -dev 2011-11-24 14:00:10 +00:00
Johannes Schlüter
e9087c9d4a - PHP 5.3.9RC2 2011-11-24 12:57:59 +00:00
Pierre Joye
36e4c600c3 - merge crt warning change (r216594) and rename the ini to windows.show_crt_warning 2011-11-24 12:46:45 +00:00
Pierre Joye
fb53dd80d8 - merge crt warning change (r216594) and rename the ini to windows.show_crt_warning 2011-11-24 12:46:45 +00:00
Pierre Joye
89193ecf61 - merge crt warning change (r216594) and rename the ini to windows.show_crt_warning 2011-11-24 12:46:45 +00:00
Stanislav Malyshev
c05614fb6d back to dev 2011-11-24 05:04:25 +00:00
Stanislav Malyshev
953016b6b9 5.4.0RC2 2011-11-24 05:03:22 +00:00
Pierrick Charron
52ca90428d Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Pierrick Charron
8e2dcfd8b6 Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Xinchen Hui
efd3e69511 Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers) 2011-11-13 04:11:57 +00:00
Xinchen Hui
89feaefce1 Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers) 2011-11-13 04:11:57 +00:00
Rui Hirokawa
cc74264764 MFH: fixed bug #60227 (header() cannot detect the multi-line header with CR(0x0D).) 2011-11-10 14:24:31 +00:00
Stanislav Malyshev
7f6c7422a8 back to dev 2011-11-10 06:27:37 +00:00
Stanislav Malyshev
07f2c01bd2 5.4.0 RC1 2011-11-10 06:26:25 +00:00
Rui Hirokawa
d73b1a275d fixed bug #60227: header() cannot detect the multi-line header with CR. 2011-11-06 11:07:14 +00:00
Johannes Schlüter
98dfe36852 Back to -dev 2011-11-03 15:26:34 +00:00
Johannes Schlüter
60937c2cf6 - PHP 5.3.9RC1 2011-11-03 15:08:19 +00:00
Stanislav Malyshev
93f654e64f back to dev 2011-10-20 06:06:35 +00:00
Stanislav Malyshev
91a04638e6 5.4.0beta2 2011-10-20 06:05:30 +00:00
Xinchen Hui
1f78177e2b Fixed bug #60038 (SIGALRM cause segfault in php_error_cb) 2011-10-16 03:00:51 +00:00
Xinchen Hui
077519d3fb Fixed bug #60038 (SIGALRM cause segfault in php_error_cb) 2011-10-16 03:00:51 +00:00
Xinchen Hui
c5ac13f632 Merge r316812 to trunk 2011-10-16 01:19:55 +00:00
Pierre Joye
d435ddbe52 - be sure to check if the var ha not been removed between the two calls 2011-09-26 08:49:28 +00:00
Xinchen Hui
bf2dfb5fff unused var 2011-09-24 01:05:43 +00:00
Xinchen Hui
5d1ba1d13f unused var 2011-09-24 01:05:43 +00:00
Xinchen Hui
58800b8ac1 Fixed bug #55758 (Digest Authenticate missed in 5.4)
the block I am removing should be removed along with the PG(saf_mod) condition.
 since it is inside the PG(saf_mod) condition block.
2011-09-23 02:56:25 +00:00
Xinchen Hui
ea74b9c212 Fixed bug #55758 (Digest Authenticate missed in 5.4)
the block I am removing should be removed along with the PG(saf_mod) condition.
 since it is inside the PG(saf_mod) condition block.
2011-09-23 02:56:25 +00:00
Dmitry Stogov
77bda2614d Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Dmitry Stogov
a223328b52 Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Xinchen Hui
f265c5a573 Fix warning "implicit declaration of function `vasprintf'"
If There is a better fix, plz fixme.
2011-09-15 07:09:43 +00:00
Xinchen Hui
c32aa35d58 Fix warning "implicit declaration of function `vasprintf'"
If There is a better fix, plz fixme.
2011-09-15 07:09:43 +00:00