summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-145-1244/+0
* Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-101-1/+1
|\
| * typo fixStanislav Malyshev2012-06-101-1/+1
* | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-081-0/+5
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-081-0/+5
| |\
| | * improve overflow checksStanislav Malyshev2012-06-081-5/+5
| | * fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| | * PHP 5.3.15-devJohannes Schlüter2012-05-161-3/+3
| | * This will be PHP 5.3.14Johannes Schlüter2012-05-081-3/+3
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-071-3/+8
|\ \ \ | |/ /
| * | fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| * | to 5.4.5-devStanislav Malyshev2012-05-151-2/+2
* | | 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
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-05-061-1/+6
| |\ \ | | |/
| | * 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
| |\ \ | | |/
| | * Bump to next versionChristopher Jones2012-05-031-3/+3
| * | Update to 5.4.2-devChristopher Jones2012-04-191-4/+4
* | | 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
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-04-061-1/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-04-061-1/+3
| |\ \ | | |/
| | * Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (withou...Xinchen Hui2012-04-061-1/+3
| | * Cherry-pick 4cc74767Gustavo André dos Santos Lopes2012-04-041-10/+19
| | * 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
|\ \ \ | |/ /
| * | 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 used...Klaus Silveira2012-04-021-4/+4
* | | Merge branch 'PHP-5.4'David Soria Parra2012-03-311-1/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra2012-03-311-1/+0
| |\ \ | | |/
| | * 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
| | |\
| | | * 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 [s...Pierre Joye2012-03-211-0/+4
| | |/
| | * - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leakGustavo André dos Santos Lopes2012-03-171-1/+1
| | * - 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
| | * - size_t may be shorter than long and definitely is not signed. Note that theGustavo André dos Santos Lopes2012-03-041-1/+3
| | * Fixed bug #60106 (stream_socket_server silently truncates long unix socket pa...Ilia Alshanetsky2012-03-031-0/+1
| | * Fix bug 61193Rasmus Lerdorf2012-02-271-8/+3
| | * - Better fix for #61115.Gustavo André dos Santos Lopes2012-02-241-3/+8