clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,937 Commits 491 Branches 1,363 Tags 841 MiB
61e1f79585
Commit Graph

3921 Commits

Author SHA1 Message Date
Stanislav Malyshev
426ccd3e7f Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix potential overflow in _php_stream_scandir
 2012-06-07 23:09:37 -07:00
Stanislav Malyshev
10e8da1738 fix potential overflow in _php_stream_scandir 2012-06-07 23:09:18 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Johannes Schlüter
72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Stanislav Malyshev
be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -07:00
Michael Wallner
2d11e55b94 cleanup merge 2012-05-15 09:44:01 +02:00
Michael Wallner
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version 
Bump PHP version number
 2012-05-03 12:03:49 -07:00
Christopher Jones
701332ce30 Update to 5.4.2-dev 
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
 2012-04-19 10:45:21 -07:00
Xinchen Hui
579d234f50 Merge branch 'PHP-5.4' 2012-04-15 01:17:56 +08:00
Xinchen Hui
3b42f184cd Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx) 2012-04-15 01:16:34 +08:00
Gustavo André dos Santos Lopes
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb Fixed bug in new stream_get_line() when using NUL as a delimiter. 
This is the issue Derick spotted a few days ago..
 2012-04-07 16:32:19 +01:00
Xinchen Hui
7497aa9c4e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update NEWS
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
 2012-04-06 22:00:15 +08:00
Xinchen Hui
b0f09b69d3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
 2012-04-06 21:57:56 +08:00
Xinchen Hui
9bf8cd4b34 Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) 2012-04-06 21:42:40 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc Cherry-pick 4cc74767 
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

	ext/standard/tests/general_functions/bug60227.phpt
	ext/standard/tests/general_functions/bug60227_1.phpt
	ext/standard/tests/general_functions/bug60227_2.phpt
	main/SAPI.c
 2012-04-04 09:59:51 +01:00
Xinchen Hui
f7bf83546e Fix warning "suggest parentheses around assignment" 2012-04-04 16:35:32 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
 2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Klaus Silveira
16bd11062e Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient. 2012-04-02 22:54:57 -03:00
David Soria Parra
cae2556462 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:43 +02:00
David Soria Parra
3bf53aa911 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:25 +02:00
reeze
ff8be9845f Cleanup Safe Mode related comment in SG(request_info) 2012-03-31 09:34:08 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Pierre Joye
95dcd799fb - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664 2012-03-21 06:58:55 +01:00
Gustavo André dos Santos Lopes
9a460497da MFH: 45a6f8d for 5.4. 
- 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.
 2012-03-19 16:34:31 +00:00
Gustavo André dos Santos Lopes
e132db7a57 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
d974e44248 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
cdc512afb3 - 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
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
Stanislav Malyshev
f5b8a3b40e back to dev 2011-09-15 06:25:52 +00:00
Stanislav Malyshev
fe85ca8737 5.4.0beta 2011-09-15 06:24:18 +00:00
Kalle Sommer Nielsen
e1068269f0 MFT: Fix build on Windows 2011-09-13 14:35:28 +00:00
Kalle Sommer Nielsen
e9ebd1c689 Fix build on Windows 2011-09-13 14:35:12 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Pierre Joye
5a49af4253 - do not display the crt warnings anymore by default. It is enough to simply fail from a user land pov as it is the case on posix platforms 2011-09-13 10:38:12 +00:00
Pierre Joye
c1db9d4a87 - do not display the crt warnings anymore by default. It is enough to simply fail from a user land pov as it is the case on posix platforms 2011-09-13 10:38:12 +00:00
Hannes Magnusson
797a1ce88f Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST request 2011-09-07 16:19:09 +00:00
Hannes Magnusson
994df9f1d1 Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST request 2011-09-07 16:19:09 +00:00
Hannes Magnusson
43fb787add Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST request 2011-09-07 16:19:09 +00:00
Gustavo André dos Santos Lopes
08f78070a5 - Fixed borked refactoring in r307437 (using SUCCESS/FAILURE return instead of 
out parameter).
- Fixed signature of php_stream_copy_to_stream_ex to return int in 5.4/trunk
  instead of size_t, as the function only returns SUCCESS/FAILURE.
 2011-09-04 22:36:33 +00:00
Gustavo André dos Santos Lopes
2acbe4c93e - Fixed borked refactoring in r307437 (using SUCCESS/FAILURE return instead of 
out parameter).
- Fixed signature of php_stream_copy_to_stream_ex to return int in 5.4/trunk
  instead of size_t, as the function only returns SUCCESS/FAILURE.
 2011-09-04 22:36:33 +00:00
Gustavo André dos Santos Lopes
d5c5bb0e96 - Fixed borked refactoring in r307437 (using SUCCESS/FAILURE return instead of 
out parameter).
- Fixed signature of php_stream_copy_to_stream_ex to return int in 5.4/trunk
  instead of size_t, as the function only returns SUCCESS/FAILURE.
 2011-09-04 22:36:33 +00:00
Arpad Ray
1e1bfba576 fix #55510: $_FILES 'name' missing first character after upload 2011-08-29 21:11:07 +00:00
Pierre Joye
687e310a46 - ws 2011-08-23 18:32:53 +00:00
Pierre Joye
048485587e - ws 2011-08-23 18:32:53 +00:00
Xinchen Hui
9fb62f3382 Sync r314808 to 5_3 branch 
Eliminated compiler warnings "comparison is always false",  "cast to pointer from integer of different siz" and tail zero warnings
 2011-08-23 10:18:48 +00:00
Johannes Schlüter
5f502879ff Back to -dev 2011-08-22 23:24:22 +00:00
Johannes Schlüter
952b9a9695 - PHP 5.3.8 2011-08-22 22:08:48 +00:00
Ilia Alshanetsky
eb1470aa3f Back to dev 2011-08-17 14:28:24 +00:00
Ilia Alshanetsky
6e284c6ce7 5.3.7 2011-08-17 13:30:04 +00:00
Xinchen Hui
fa1883de19 Omitted GCC warning "comparison is always false" 2011-08-12 07:47:03 +00:00
Xinchen Hui
ba9546b8e5 Omitted GCC warning "comparison is always false" 2011-08-12 07:47:03 +00:00
Ilia Alshanetsky
d090061f5e Back to dev 2011-08-11 14:35:08 +00:00
Ilia Alshanetsky
db472c60cf 5.3.7RC5 2011-08-11 13:02:49 +00:00
Derick Rethans
840ef1e320 - Turn on html_errors by default again in php.ini-production like it was in 
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
 2011-08-10 16:31:29 +00:00
Derick Rethans
7b84e7ea1c - Turn on html_errors by default again in php.ini-production like it was in 
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
 2011-08-10 16:31:29 +00:00
Michael Wallner
70c284009d fix coverity issue 1054: missing break/return 2011-08-10 11:01:09 +00:00
Michael Wallner
daccb503b2 fix coverity issue 1054: missing break/return 2011-08-10 11:01:09 +00:00
Xinchen Hui
409022b742 Fixed built (missing 2nd arg for strncpy) 2011-08-09 13:04:35 +00:00
Xinchen Hui
64fc565765 Avoiding strcpy, strcat, sprintf usage to make static analyzer happy 2011-08-09 12:16:58 +00:00
Xinchen Hui
5dc3195897 Avoiding strcpy, strcat, sprintf usage to make static analyzer happy 2011-08-09 12:16:58 +00:00
Xinchen Hui
0630945ac4 Avoiding strcpy, strcat, sprintf usage to make static analyzer happy 2011-08-09 12:16:58 +00:00
Pierrick Charron
97ac5d3f53 Remove unused variable 2011-08-09 02:42:25 +00:00
Pierrick Charron
6290b8814c Remove unused variable 2011-08-09 02:42:25 +00:00
Pierrick Charron
71f76fe4d6 Remove unused variable 2011-08-09 02:42:25 +00:00
Pierrick Charron
cb1cd0b3ab Remove unused variable 2011-08-09 02:37:02 +00:00
Pierrick Charron
f6c2511748 Remove unused variable 2011-08-09 02:37:02 +00:00
Pierrick Charron
5998f27321 Remove unused variable 2011-08-09 02:37:02 +00:00
Rasmus Lerdorf
14e1bc89bc Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Rasmus Lerdorf
6379f87b31 Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Rasmus Lerdorf
1bc34a491c Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Stanislav Malyshev
3e7ce20a5b back to dev 2011-08-03 17:14:26 +00:00
Stanislav Malyshev
7c289f7f8e 5.4.0alpha3 2011-08-03 17:12:44 +00:00
Stanislav Malyshev
fa78f7a4c0 retore open_basedir check for unlink 2011-07-31 22:43:21 +00:00
Stanislav Malyshev
2f1752cb49 retore open_basedir check for unlink 2011-07-31 22:43:21 +00:00
Ilia Alshanetsky
5b0373b060 back to dev 2011-07-28 11:54:53 +00:00
Ilia Alshanetsky
d69796f23f 5.3.7RC4 2011-07-28 11:53:46 +00:00
Pierre Joye
dd06894b56 - do not resolve the link if all we want is to open that file 2011-07-27 12:20:32 +00:00
Pierre Joye
e7d106f11d - do not resolve the link if all we want is to open that file 2011-07-27 12:20:32 +00:00
Pierre Joye
fc8afdf178 - Fixed bug 55124, recursive mkdir fails with current (dot) directory in path 2011-07-26 17:44:20 +00:00
Pierre Joye
db25201ffb - Fixed bug 55124, recursive mkdir fails with current (dot) directory in path 2011-07-26 17:44:20 +00:00
Pierre Joye
4cbca588f7 - simplify 2011-07-26 09:27:53 +00:00
Pierre Joye
3b6ad85fa9 - simplify 2011-07-26 09:27:53 +00:00
Pierre Joye
090bfcdfe1 - add expand_filepath_with_mode (not used anywhere yet but will be used for file ops (fopen&co) to avoid extra links resolution and other non required ops on open 2011-07-25 16:50:07 +00:00
Pierre Joye
a02d8cfa33 - add expand_filepath_with_mode (not used anywhere yet but will be used for file ops (fopen&co) to avoid extra links resolution and other non required ops on open 2011-07-25 16:50:07 +00:00
Felipe Pena
054e1cafa0 - Added new macro to be used in the end of zend_function_entry declaration (Gwynne) 2011-07-25 11:30:53 +00:00