summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Bump yearXinchen Hui2014-01-0364-64/+64
|
* Merge branch 'PHP-5.5' into PHP-5.6krakjoe2014-01-011-18/+25
|\ | | | | | | | | * PHP-5.5: fix #66375 bad logic in sapi header callback routine
| * Merge branch 'PHP-5.4' into PHP-5.5krakjoe2014-01-011-18/+25
| |\ | | | | | | | | | | | | * PHP-5.4: fix #66375 bad logic in sapi header callback routine
| | * fix #66375 bad logic in sapi header callback routinekrakjoe2014-01-011-18/+25
| | |
| | * 5.4.25 nextStanislav Malyshev2013-12-241-3/+3
| | |
* | | Add E_DEPRECATED when populating $HTTP_RAW_POST_DATAMichael Wallner2013-12-302-1/+6
| | |
* | | add 'never'Michael Wallner2013-12-301-0/+3
| | |
* | | fix typeMichael Wallner2013-12-301-1/+1
| | |
* | | s/BOOLEAN/ENTRY/Michael Wallner2013-12-301-1/+1
| | |
* | | re-introduce always_populate_raw_post_dataMichael Wallner2013-12-303-0/+57
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #65486 mysqli_poll() is broken on Win x64
| * | Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this issue is visible in mysqli_poll() functions, the cause lays deeper in the stream to socket casting API. On Win x64 the SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like it's 32 bit signed integer. The game of casting 32 bit var to/from 64 bit pointer back and forth is the best way to break it. Further more, while socket and file descriptors are always integers on Linux, those are different things using different APIs on Windows. Even though using integer instead of SOCKET might work on Windows, this issue might need to be revamped more carefully later. By this time this patch is tested well with phpt and apps and shows no regressions, neither in mysqli_poll() nor in any other parts.
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-061-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed bug #61645 (fopen and O_NONBLOCK) fix possibly uninitialized value
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-061-5/+7
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: Fixed bug #61645 (fopen and O_NONBLOCK) fix possibly uninitialized value
| | * Fixed bug #61645 (fopen and O_NONBLOCK)Michael Wallner2013-12-061-5/+7
| | | | | | | | | | | | | | | | | | if a mode like "rn" was passed to fopen(), then php_stream_parse_fopen_modes() would assign O_WRONLY to flags, because O_NONBLOCK tainted flags for the r/w/+ check
| | * 5.4.24-dev nowStanislav Malyshev2013-11-271-3/+3
| | |
| | * 5.4.23-devStanislav Malyshev2013-10-291-3/+3
| | |
| | * 5.4.22-dev nowStanislav Malyshev2013-10-011-3/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Sara Golemon2013-12-031-1/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix php_module_startup() when loading more than one additional module
| * | Fix php_module_startup() when loading more than one additional moduleSara Golemon2013-12-031-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dereferencing addition_modules within php_module_startup would point to a vector entirely on the stack (which is of course, wrong). Use a specialized helper to keep BC with the current php_module_startup() calling semantics. Fixes 63159 Thanks to @a-j-k
| * | 5.5.8-dev nowJulien Pauli2013-11-271-3/+3
| | |
| * | 5.5.7 nowJulien Pauli2013-11-121-3/+3
| | |
| * | Increment version number, since this will be 5.5.6.Adam Harvey2013-10-231-3/+3
| | |
* | | bump API versionsFerenc Kovacs2013-11-061-1/+1
| | |
* | | back to do_alloca()Anatol Belski2013-10-311-3/+4
| | |
* | | back to do_alloca(), reverted the wrong replacementAnatol Belski2013-10-301-2/+3
| | |
* | | 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
| | | | |
View Lorry Controller Status