Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix wddx mergephp-7.0.4PHP-7.0.4 | Stanislav Malyshev | 2016-03-02 | 1 | -2/+2 |
| | |||||
* | Merge branch 'PHP-5.6.19' into PHP-7.0.4 | Stanislav Malyshev | 2016-03-01 | 7 | -4/+76 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.19: fix test file Fix version update NEWS Update NEWS Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() fix ts buld prep for 5.6.19RC1 5.6.20 is next Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize Conflicts: configure.in ext/wddx/wddx.c main/php_version.h | ||||
| * | Merge branch 'PHP-5.5' into PHP-5.6.19 | Stanislav Malyshev | 2016-03-01 | 1 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix test file Fix version Update NEWS | ||||
| | * | fix test file | Stanislav Malyshev | 2016-03-01 | 1 | -0/+0 |
| | | | |||||
| * | | Merge branch 'PHP-5.5.33' into PHP-5.6.19 | Stanislav Malyshev | 2016-03-01 | 6 | -7/+79 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.5.33: Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize | ||||
| | * | Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() | Stanislav Malyshev | 2016-02-21 | 4 | -3/+21 |
| | | | |||||
| | * | Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize | Stanislav Malyshev | 2016-02-14 | 2 | -4/+58 |
| | | | |||||
| * | | yet two test fixes in openssl in 5.6 | Anatol Belski | 2016-02-16 | 2 | -4/+7 |
| | | | |||||
* | | | Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() | Stanislav Malyshev | 2016-03-01 | 2 | -0/+17 |
| | | | |||||
* | | | Fix bug #71637: Multiple Heap Overflow due to integer overflows | Stanislav Malyshev | 2016-03-01 | 3 | -3/+3 |
| | | | |||||
* | | | Fixed another segfault with file_cache_only now | Xinchen Hui | 2016-03-01 | 1 | -0/+4 |
| | | | |||||
* | | | Fixed segfault with file_cache_only | Xinchen Hui | 2016-02-28 | 1 | -0/+4 |
| | | | |||||
* | | | Fixed possible crash at PCRE on MSHUTDOWN | Dmitry Stogov | 2016-02-26 | 4 | -5/+24 |
| | | | |||||
* | | | Fixed more synchronisation issues during SHM reload | Dmitry Stogov | 2016-02-26 | 3 | -116/+141 |
| | | | |||||
* | | | Set proper type flags (REFCOUNTED and COPYABLE) according to interned or ↵ | Dmitry Stogov | 2016-02-26 | 1 | -8/+2 |
| | | | | | | | | | | | | regular string | ||||
* | | | Fixed process synchronisation problem, that may cause crashes after opcache ↵ | Dmitry Stogov | 2016-02-24 | 3 | -5/+17 |
| | | | | | | | | | | | | restart | ||||
* | | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-02-16 | 1 | -4/+6 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.6: improve test | ||||
| * | | improve test | Anatol Belski | 2016-02-16 | 1 | -4/+6 |
| | | | |||||
| * | | Fix timelib compat with PHP5 | Anatol Belski | 2016-02-15 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | Windows builds in PHP5 are always using long which is 32-bit even in 64-bit build. Thus in PHP5, timelib_long and the company have to always evaluate to a 32-bit. | ||||
| * | | Backported fix for bug #71525 | Anatol Belski | 2016-02-15 | 2 | -0/+21 |
| | | | |||||
| * | | Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() | Stanislav Malyshev | 2016-02-15 | 2 | -0/+71 |
| | | | |||||
| * | | fix dir separator in test | Anatol Belski | 2016-02-15 | 1 | -3/+3 |
| | | | |||||
* | | | Fixed bug #71603 (compact() maintains references in php7) | Xinchen Hui | 2016-02-16 | 2 | -0/+16 |
| | | | |||||
* | | | Fixed possible memory leak | Dmitry Stogov | 2016-02-15 | 1 | -0/+1 |
| | | | |||||
* | | | Added missing semicolon | Dmitry Stogov | 2016-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | More fixing for bug #71540 | Stanislav Malyshev | 2016-02-15 | 2 | -1/+3 |
| | | | |||||
* | | | Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() | Stanislav Malyshev | 2016-02-15 | 2 | -0/+71 |
| | | | |||||
* | | | fix dir separator in test | Anatol Belski | 2016-02-15 | 1 | -3/+3 |
| | | | |||||
* | | | make sure the tests always uses same tz | Anatol Belski | 2016-02-15 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 | Xinchen Hui | 2016-02-15 | 2 | -0/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-7.0' of git.php.net:/php-src: fixed news entry fix NEWS entry update NEWS Fix bug #71525 | ||||
| * | | | Fix bug #71525 | Sean DuBois | 2016-02-15 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out it latters causes other date operations to fail (like date_date_set) | ||||
* | | | | Fixed typo (I think it should be a typo) | Xinchen Hui | 2016-02-15 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'PHP-5.6' into PHP-7.0 | Xinchen Hui | 2016-02-15 | 1 | -6/+5 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)" Fix use-after-free of ZCG(cwd) in Zend Optimizer Conflicts: ext/opcache/ZendAccelerator.c | ||||
| * | | Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 | Xinchen Hui | 2016-02-15 | 4 | -15/+39 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.6' of git.php.net:/php-src: update NEWS Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug Check length of string before comparing to :memory: Fix bounds check in strip_tags() Fix test description FIx bug #71569 | ||||
| * | | | Fix use-after-free of ZCG(cwd) in Zend Optimizer | Yussuf Khalil | 2016-02-10 | 1 | -6/+5 |
| | | | | |||||
* | | | | Format string fixes | Nikita Popov | 2016-02-14 | 8 | -19/+21 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: ext/pgsql/pgsql.c | ||||
* | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-02-13 | 1 | -1/+2 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: ext/sqlite3/sqlite3.c | ||||
| * | | | Check length of string before comparing to :memory: | Nikita Popov | 2016-02-13 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-02-13 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix bounds check in strip_tags() | Nikita Popov | 2016-02-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix test description | Nikita Popov | 2016-02-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix extract() overwriting its own argument | Nikita Popov | 2016-02-13 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | Already covered by bug46873.phpt under valgrind. | ||||
* | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2016-02-13 | 1 | -0/+23 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: ext/pdo_mysql/mysql_driver.c | ||||
| * | | | FIx bug #71569 | Nikita Popov | 2016-02-13 | 2 | -13/+36 |
| |/ / | | | | | | | | | | convert_to_string() may result in an interned string. | ||||
* | | | Merge branch 'PHP-5.6' into PHP-7.0 | Xinchen Hui | 2016-02-09 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: ext/zip/php_zip.c | ||||
| * | | Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 | Xinchen Hui | 2016-02-09 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo) | Xinchen Hui | 2016-02-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-02-08 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | * PHP-5.6: Align spacing in make install messages Add entry for re-fix of #70976 in commit 14e4d393 | ||||
| * | | | Align spacing in make install messages | Lior Kaplan | 2016-02-08 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fixed memory leak in curl_getinfo() | Leigh | 2016-02-08 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | The "v ? v" in the CAASTR macro caused zend_string_copy to be called twice |