summaryrefslogtreecommitdiff
path: root/ext/pcre
Commit message (Collapse)AuthorAgeFilesLines
* Happy Year of Monkey (Forgot test of #71537)Xinchen Hui2016-02-081-0/+9
|
* Fixed bug #71537 (PCRE segfault from Opcache)Xinchen Hui2016-02-071-6/+8
|
* Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-01-3151-1573/+3279
|\ | | | | | | | | | | | | | | | | | | * PHP-5.6: Upgrade bundled PCRE to 8.38 Fixed NEWS file entry fix the fix for bug #70976 (imagerotate) Conflicts: ext/pcre/pcrelib/config.h
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-01-3150-1511/+3141
| |\ | | | | | | | | | | | | | | | | | | * PHP-5.5: Upgrade bundled PCRE to 8.38 Fixed NEWS file entry fix the fix for bug #70976 (imagerotate)
| | * Upgrade bundled PCRE to 8.38Stanislav Malyshev2016-01-3150-1511/+3141
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-012-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| | |
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-09-011-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: More fixes for bug #70219
| | * Merge branch 'PHP-5.4.45' into PHP-5.5.29Stanislav Malyshev2015-09-012-74/+98
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.45: add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c
* | | | Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if ↵Xinchen Hui2015-12-211-1/+1
| | | | | | | | | | | | | | | | not already set)
* | | | add comment to testAnatol Belski2015-10-071-0/+2
| | | |
* | | | Removed or simplified incorrect SEPARATE_*() macros usage.Dmitry Stogov2015-09-291-2/+0
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-09-022-3/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (21 commits) fix unit tests update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) ... Conflicts: ext/exif/exif.c ext/gmp/gmp.c ext/pcre/php_pcre.c ext/session/session.c ext/session/tests/session_decode_variation3.phpt ext/soap/soap.c ext/spl/spl_observer.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/xsl/xsltprocessor.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-09-012-69/+93
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c
| | * \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-09-012-73/+97
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: configure.in ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_version.h
| | | * Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)Stanislav Malyshev2015-08-282-76/+100
| | | |
* | | | add some range checks to pcreAnatol Belski2015-08-261-0/+15
| | | |
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-132-9/+82
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix #70232: Incorrect bump-along behavior with \K and empty string match Resolved conflicts: ext/pcre/php_pcre.c
| * | | Fix #70232: Incorrect bump-along behavior with \K and empty string matchChristoph M. Becker2015-08-132-9/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To do global matching (/g), for every empty match we have to do a second match with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape sequence is involved. For this purpose libpcre 8.0 introduced the PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall back to the old (possibly buggy) behavior.
* | | | Merge branch 'pull-request/1439'Christoph M. Becker2015-07-292-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1439: fixed broken test add new error constant PREG_JIT_STACKLIMIT_ERROR
| * | | | add new error constant PREG_JIT_STACKLIMIT_ERRORChristoph M. Becker2015-07-262-1/+19
| | | | |
* | | | | first stone on using the unified globals accessorAnatol Belski2015-07-291-6/+1
|/ / / /
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-262-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: allow to skip slow tests
| * | | allow to skip slow testsChristoph M. Becker2015-07-262-0/+8
| | | |
* | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-38/+38
| | | | | | | | | | | | | | | | semantick changes).
* | | | Improved zend_string API (Francois Laupretre)Dmitry Stogov2015-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-233-4/+87
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-233-4/+87
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
| | * | Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the ↵Christoph M. Becker2015-06-233-4/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string) When advancing after empty matches, php_pcre_match_impl() as well as php_pcre_replace_impl() always have to advance to the next code point when the u modifier is given, instead of to the next byte.
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-232-5/+53
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fixed bug #69864 (Segfault in preg_replace_callback)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Christoph M. Becker2015-06-232-6/+54
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #69864 (Segfault in preg_replace_callback)
| | * | Fixed bug #69864 (Segfault in preg_replace_callback)Christoph M. Becker2015-06-232-6/+54
| | | | | | | | | | | | | | | | | | | | When preg_replace_callback() is used, cache entries which are in use must not be removed. We ensure that by deploying a simple refcounting mechanism.
* | | | Fixed Bug #69883 (Compilation failed on PCRE)Xinchen Hui2015-06-191-2/+10
| | | |
* | | | Micro optimizations for pcreXinchen Hui2015-06-191-50/+59
| | | |
* | | | Merge branch 'PHP-5.6'Lior Kaplan2015-06-181-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fixed bug #69689 (Align PCRE_MINOR with current version)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-06-181-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed bug #69689 (Align PCRE_MINOR with current version)
| | * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2015-06-181-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Fixed bug #69689 (Align PCRE_MINOR with current version)
| | | * Fixed bug #69689 (Align PCRE_MINOR with current version)Lior Kaplan2015-06-181-2/+2
| | | |
* | | | Use better hash functions (reuse key and avoid hash value recalculation)Dmitry Stogov2015-06-171-2/+5
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-05-301-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update PCRE version (bug #69689) move test NEWS 5.4 fix new test Fixed Bug #69667 segfault in php_pgsql_meta_data 5.4.42 next
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-301-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Update PCRE version (bug #69689) move test NEWS 5.4 fix new test Fixed Bug #69667 segfault in php_pgsql_meta_data 5.4.42 next
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-301-3/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Update PCRE version (bug #69689) move test NEWS 5.4 fix new test Fixed Bug #69667 segfault in php_pgsql_meta_data 5.4.42 next Conflicts: configure.in main/php_version.h
| | | * Update PCRE version (bug #69689)Stanislav Malyshev2015-05-301-3/+3
| | | |
* | | | fix typosolshevskiy872015-05-132-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-2925-2128/+2499
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Upgrade to PCRE 8.37 due to various bugfixes Conflicts: ext/pcre/config.w32 ext/pcre/config0.m4 ext/pcre/pcrelib/pcre_jit_compile.c ext/pcre/pcrelib/sljit/sljitConfig.h ext/pcre/pcrelib/sljit/sljitConfigInternal.h ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeARM_64.c ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c ext/pcre/pcrelib/sljit/sljitNativePPC_common.c ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pcre/pcrelib/sljit/sljitNativeX86_32.c ext/pcre/pcrelib/sljit/sljitNativeX86_64.c ext/pcre/pcrelib/sljit/sljitNativeX86_common.c ext/pcre/pcrelib/sljit/sljitUtils.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-2935-186/+47117
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Upgrade to PCRE 8.37 due to various bugfixes
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-04-2935-186/+47117
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Upgrade to PCRE 8.37 due to various bugfixes
| | | * Upgrade to PCRE 8.37 due to various bugfixesStanislav Malyshev2015-04-2935-186/+47117
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-04-281-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: fix VC9 build with PCRE Revert "Fix segfault in ext/date since 957aa2"
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2015-04-281-0/+4
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: fix VC9 build with PCRE
View Lorry Controller Status