php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
49,385 Commits 547 Branches 1,483 Tags
f826ea093f8317dda2e5476db128dc5ad3eba442
Commit Graph

3367 Commits

Author SHA1 Message Date
Stanislav Malyshev
fc74503792 improve overflow checks 2012-06-08 01:21:37 -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
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +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
0956c00af9 Bump to next version 
Bump PHP version number
 2012-05-03 12:03:49 -07: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
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
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08: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
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
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
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
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
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Rasmus Lerdorf
99c70829a0 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
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
Mateusz Kocielski
ddcf55b640 * 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
Xinchen Hui
3f23b11151 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
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +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
89bc5ece51 Fixed memory leaks 2012-02-02 10:26:53 +00:00
Stanislav Malyshev
40d8cd1f12 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +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
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
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
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +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
8dad134ad7 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
Dmitry Stogov
0d1998e34f Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 08:47:03 +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
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
Derick Rethans
45ae82d3f1 - Fixed bug #60373 (Startup errors with log_errors on cause segfault). 2011-11-25 14:06:55 +00:00