summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* cleanup mergeMichael Wallner2012-05-152-1/+3
|\
| * fix bug #60761 zlib.output_compression fails on refreshMichael Wallner2012-05-152-1/+3
| |
| * Bump to 5.4.4-devChristopher Jones2012-05-141-3/+3
| |
* | Merge branch 'PHP-5.4'Nikita Popov2012-05-061-1/+6
|\ \ | |/ | | | | | | | | * PHP-5.4: Add NEWS entry for bug #61961 Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
| * Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-05-061-1/+6
| |\ | | | | | | | | | | | | | | | * PHP-5.3: Add NEWS entry for bug #61961 Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
| | * Fixed Bug #61961 (file_get_content leaks when access empty file with max length)Reeze Xia2012-05-061-1/+6
| | |
| * | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-05-031-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Bump to next version Conflicts: configure.in main/php_version.h
| | * Bump to next versionChristopher Jones2012-05-031-3/+3
| | | | | | | | | | | | Bump PHP version number
| * | Update to 5.4.2-devChristopher Jones2012-04-191-4/+4
| | | | | | | | | | | | After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-151-7/+7
|\ \ \ | |/ /
| * | Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)Xinchen Hui2012-04-151-7/+7
| | |
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-04-071-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-04-071-2/+2
| |\ \ | | |/
| | * Fixed bug in new stream_get_line() when using NUL as a delimiter.Gustavo André dos Santos Lopes2012-04-071-2/+2
| | | | | | | | | | | | This is the issue Derick spotted a few days ago..
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-061-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Update NEWS Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-04-061-1/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
| | * Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables ↵Xinchen Hui2012-04-061-1/+3
| | | | | | | | | | | | (without apache2))
| | * Cherry-pick 4cc74767Gustavo André dos Santos Lopes2012-04-041-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix warning "suggest parentheses around assignment"Xinchen Hui2012-04-041-1/+1
| | |
| | * Fixed bug #61605 (header_remove() does not remove all headers)Xinchen Hui2012-04-041-6/+32
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-041-6/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #61605 (header_remove() does not remove all headers) Conflicts: NEWS
| * | Fixed bug Fixed bug #61605 (header_remove() does not remove all headers)Xinchen Hui2012-04-041-6/+32
| | |
* | | Small performance improvement. The current code is correct, but if it is ↵Klaus Silveira2012-04-021-4/+4
| | | | | | | | | | | | used inside a long loop or long strings, it's inefficient.
* | | Merge branch 'PHP-5.4'David Soria Parra2012-03-311-1/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Cleanup Safe Mode related comment in SG(request_info)
| * | Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra2012-03-311-1/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Cleanup Safe Mode related comment in SG(request_info)
| | * Cleanup Safe Mode related comment in SG(request_info)reeze2012-03-311-1/+0
| | |
| | * This will be PHP 5.3.12Johannes Schlüter2012-03-291-3/+3
| | |
| | * - fix bug #61541, Segfault when using ob_* in output_callbackreeze2012-03-291-0/+11
| | |
| | * Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831)Gustavo André dos Santos Lopes2012-03-211-4/+9
| | |\ | | | | | | | | | | | | | | | | | | | | 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>
| | | * Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)Ondřej Surý2012-03-211-4/+9
| | | |
| | * | - merge fix bug #54374, bug #55500 - filter file names better, no dangling ↵Pierre Joye2012-03-211-0/+4
| | |/ | | | | | | | | | [s, svn revision 321664
| | * - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leakGustavo André dos Santos Lopes2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * - Oops committed old version of the patch in r324020. Fixed. See bug #61253.Gustavo André dos Santos Lopes2012-03-081-1/+1
| | |
| | * - Fixed bug #61253: Wrappers opened with errors concurrency problemGustavo André dos Santos Lopes2012-03-082-40/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #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.
| | * - size_t may be shorter than long and definitely is not signed. Note that theGustavo André dos Santos Lopes2012-03-041-1/+3
| | | | | | | | | | | | | | | z modifier was only added in C99, so we can't use it.
| | * Fixed bug #60106 (stream_socket_server silently truncates long unix socket ↵Ilia Alshanetsky2012-03-031-0/+1
| | | | | | | | | | | | paths)
| | * Fix bug 61193Rasmus Lerdorf2012-02-271-8/+3
| | |
| | * - Better fix for #61115.Gustavo André dos Santos Lopes2012-02-241-3/+8
| | | | | | | | | | | | | | | - Fixed resource leak in stream_socket_client().
| | * - Fixed bug #61115 (stream related segfault on fatal error inGustavo André dos Santos Lopes2012-02-221-3/+5
| | | | | | | | | | | | | | | | | | | | | php_stream_context_link). #run-tests.php is not currently detecting the segfault in the test #Missing 5.4 merge
| | * * fixed bug #60704 unlink() bug with some files pathMateusz Kocielski2012-02-141-6/+17
| | | | | | | | | | | | | | | Reviewed by: rasmus@
| | * Improved max_input_vars directive to check nested variablesDmitry Stogov2012-02-142-33/+32
| | |
| | * Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars).Xinchen Hui2012-02-081-2/+2
| | |
| | * Fix for bug 60986Rasmus Lerdorf2012-02-061-1/+0
| | |
| | * - Merging r323033 into 5.3 (see bug #60227).Gustavo André dos Santos Lopes2012-02-031-4/+5
| | |
| | * This will be PHP 5.3.11, 5.3.10 will be released from other branchJohannes Schlüter2012-02-021-3/+3
| | |
| | * Always restore PG(magic_quote_gpc) on request shutdownDmitry Stogov2012-02-021-2/+7
| | |
| | * Fixed memory leaksDmitry Stogov2012-02-021-2/+13
| | |
| | * fix UMR in php_register_variable_ex, reported by Stefan EsserStanislav Malyshev2012-02-011-0/+3
| | |
| | * - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detectedGustavo André dos Santos Lopes2012-01-221-48/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) ↵Dmitry Stogov2012-01-171-3/+3
| | | | | | | | | | | | bytes long)
View Lorry Controller Status