summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.10 finalphp-5.5.10PHP-5.5.10Julien Pauli2014-03-051-2/+2
|
* 5.5.10RC1php-5.5.10RC1Julien Pauli2014-02-181-4/+4
|
* Fixed Request #66574 Allow multiple paths in php_ini_scanned_pathRemi Collet2014-01-291-44/+62
| | | | | | | | | | | | | | | | | | php_ini_scanned_path, from --with-config-file-scan-dir option or from PHP_INI_SCAN_DIR environment variable allow a single path. In some case it could be useful to allow multiple. In the proposed patch, multiple paths are allow, using syntax inspired from Unix MANPATH (: separated list, empty string for builtin value). For example, this allow to use: PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d php PHP_INI_SCAN_DIR=:/myproject/php.d php PHP_INI_SCAN_DIR=/myproject/php.d: php Real use case: in SCL for dependent collections where each collection provides a separate tree for extensions, libraries and ini files.
* 5.5.9-dev nowJulien Pauli2014-01-101-3/+3
|
* Bump yearXinchen Hui2014-01-0363-63/+63
|
* 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
| |
* | 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.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
| |
* | 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
| |
* | 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
| |
* | 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.
* | 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
| |
* | 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.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
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-101-1/+3
|\ \ | |/ | | | | | | * PHP-5.4: fix possible resource leak and make sure there's something to qsort()
| * fix possible resource leak and make sure there's something to qsort()Anatol Belski2013-07-101-1/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-06-251-0/+3
|\ \ | |/ | | | | | | * PHP-5.4: - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
| * - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub ↵Felipe Pena2013-06-251-0/+3
| | | | | | | | Vrana
| * 5.4.18 nextStanislav Malyshev2013-06-181-3/+3
| |
* | Bump versionDavid Soria Parra2013-06-191-3/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-06-141-3/+11
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #63186 (compile failure on netbsd)
| * Merge branch 'PHP-5.3' into PHP-5.4Matteo Beccati2013-06-141-3/+11
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed bug #63186 (compile failure on netbsd)
| | * Fixed bug #63186 (compile failure on netbsd)Matteo Beccati2013-06-141-3/+11
| | |
| | * This will be PHP 5.3.27Johannes Schlüter2013-05-221-3/+3
| | |
| | * PHP 5.3.26 this will beJohannes Schlüter2013-04-251-3/+3
| | |
| | * Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-041-1/+1
| | |
View Lorry Controller Status