summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'bug50333' of github.com:weltling/php-src into bug50333Anatol Belski2013-10-296-22/+18
|\ \ \
| * | | applied and fixed the original patchAnatol Belski2013-10-175-21/+17
| | | | | | | | | | | | | | | | initial work on the patch import done
| * | | initial move on renaming files and fixing includesAnatol Belski2013-10-171-1/+1
| | | |
* | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-081-1/+5
|/ / /
* | | add note about request_body and php://inputMichael Wallner2013-09-191-0/+1
| | |
* | | better way to fix PRIu64 availability on windowsAnatol Belski2013-09-181-4/+3
| | |
* | | Merge branch 'PHP-5.5'Michael Wallner2013-09-181-1/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix a very rare case of use of uninitialized value combined with a memleak
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-09-181-1/+6
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: fix a very rare case of use of uninitialized value combined with a memleak
| | * fix a very rare case of use of uninitialized value combined with aMichael Wallner2013-09-181-1/+6
| | | | | | | | | | | | memleak
| | * 5.4.21 nowStanislav Malyshev2013-09-031-3/+3
| | |
| * | 5.5.5 nowJulien Pauli2013-09-041-3/+3
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-191-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: bump version Update NEWS Conflicts: configure.in main/php_version.h
| | * bump versionStanislav Malyshev2013-08-191-3/+3
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-181-1/+6
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: new for fix #65225 Fixed #65225: PHP_BINARY incorrectly set
| | * Fixed #65225: PHP_BINARY incorrectly setPatrick Allaert2013-08-181-1/+6
| | |
* | | fix build - PRIu64 vs %I64uAnatol Belski2013-09-171-0/+4
| | |
* | | Merge branch 'slim-postdata-merge'Michael Wallner2013-09-172-36/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * slim-postdata-merge: remove unused code tests make reading php://input JIT if enable_post_data_reading=0 revert stream cast fix ZTS build slim post data Conflicts: ext/soap/soap.c ext/standard/php_fopen_wrapper.c main/SAPI.c
| * | | make reading php://input JIT if enable_post_data_reading=0Michael Wallner2013-09-102-36/+43
| | | |
| * | | revert stream castMichael Wallner2013-09-101-1/+1
| | | |
| * | | slim post dataMichael Wallner2013-08-277-96/+143
| | | |
* | | | Merge branch 'slim-postdata'Michael Wallner2013-09-177-96/+143
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * slim-postdata: slim post data add NEWS entry; add simple test more precise condition make this work in vc11 too Use int64_t and atoll() after discussion with johannes ws Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
| * | | slim post dataMichael Wallner2013-08-277-96/+143
| | | |
* | | | Merge branch 'pull-request/381'Stanislav Malyshev2013-08-181-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * pull-request/381: Fixed #65225: PHP_BINARY incorrectly set
| * | | | Fixed #65225: PHP_BINARY incorrectly setPatrick Allaert2013-07-091-1/+6
| | | | |
* | | | | Merge branch 'PHP-5.5'Christopher Jones2013-08-142-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/gmp/gmp.c
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-142-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| | * | | Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-142-2/+2
| | | | | | | | | | | | | | | | | | | | uninitialized' warnings.
* | | | | Fix to file uploads >2G with size overflowAnatol Belski2013-08-141-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the file size as string when the total size would overflow LONG_MAX. Otherwise while file itself were uploaded, the size would be shown wrong. This mostly applies to systems with 32 bit long.
* | | | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-141-2/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-141-2/+2
| |\ \ \ | | |/ /
| | * | Fixed #65431 (Discarded qualifiers from pointer target warnings when using ↵Xinchen Hui2013-08-141-2/+2
| | | | | | | | | | | | | | | | --enable-dtrace) by Sixd
| * | | next is 5.5.2Stanislav Malyshev2013-07-211-3/+3
| | | |
* | | | Fixes to unified stdint usageAnatol Belski2013-08-121-2/+10
| | | | | | | | | | | | | | | | This recalls 14caf174ff219376e4f1234bd297ffe973cc416e
* | | | more precise conditionRalf Lang2013-08-061-1/+1
| | | |
* | | | make this work in vc11 tooRalf Lang2013-08-062-0/+5
| | | |
* | | | Use int64_t and atoll() after discussion with johannesRalf Lang2013-08-062-4/+4
| | | |
* | | | wsRalf Lang2013-08-061-1/+1
| | | |
* | | | Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading filesRalf Lang2013-08-062-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | above 2G. This is essentially the same as the patch "uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by jason at infininull dot com)" but using off_t instead of signed long (originally: uint) I tested this on 64bit linux and succeeded uploading a file of 4.8 G. The File did not get corrupted or truncated in any way. I did not yet test this under windows or 32 bit linux Note that there are still limitations: * Did not test for files > 8 G * php does not yet reject absurdly high values * Still limited by underlying file system specific limits and free space * in upload * tmp dir and destination dir
* | | | unify stdint type usageMichael Wallner2013-08-062-0/+200
| | | | | | | | | | | | | | | | if you need C99 stdint types, just include "php_stdint.h"
* | | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-3011-106/+115
| | | | | | | | | | | | | | | | | | | | (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
* | | | Merge branch 'PHP-5.5'Matteo Beccati2013-07-191-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: Properly fixed bug #63186 on NetBSD == 6.0
| * | | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-07-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: Properly fixed bug #63186 on NetBSD == 6.0
| | * | Properly fixed bug #63186 on NetBSD == 6.0Matteo Beccati2013-07-191-1/+1
| | | |
| | * | 5.4.19 is nextStanislav Malyshev2013-07-171-3/+3
| | | |
* | | | Merge branch 'PHP-5.5'Anatol Belski2013-07-151-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: fix buffer overrun
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-151-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: fix buffer overrun
| | * | fix buffer overrunAnatol Belski2013-07-151-0/+5
| | | |
| | * | typo fixesVeres Lajos2013-07-152-4/+4
| | | |
| * | | typo fixesVeres Lajos2013-07-152-4/+4
| | | |
* | | | typo fixesVeres Lajos2013-07-152-4/+4
| | | |
View Lorry Controller Status