summaryrefslogtreecommitdiff
path: root/ext/pcre
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-301-22/+19
|\ | | | | | | | | | | * PHP-5.5: Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream remove BOM from NEWS
| * Fixed bug #66679 Alignment Bug in PCRE 8.34 upstreamAnatol Belski2014-12-301-22/+19
| |
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-237-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Initialize the offset table - PCRE may sometimes miss offsets set default response code to 200 set default response code to 200 fix NEWS & version NEWS Fix bug #68283: fileinfo: out-of-bounds read in elf note headers Fix bug #68113 (Heap corruption in exif_thumbnail()) Fix bug #68089 - do not accept options with embedded \0 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Fix bug #68027 - fix date parsing in XMLRPC lib
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-11-031-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Initialize the offset table - PCRE may sometimes miss offsets set default response code to 200 fix NEWS & version NEWS Fix bug #68283: fileinfo: out-of-bounds read in elf note headers Fix bug #68113 (Heap corruption in exif_thumbnail()) Fix bug #68089 - do not accept options with embedded \0 Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Fix bug #68027 - fix date parsing in XMLRPC lib Conflicts: configure.in ext/curl/interface.c main/php_version.h
| | * Initialize the offset table - PCRE may sometimes miss offsetsStanislav Malyshev2014-11-031-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: typofixes
| * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: typofixes
| | * typofixesVeres Lajos2014-08-171-1/+1
| | |
| | * Bump yearXinchen Hui2014-01-032-2/+2
| | |
| | * typo fixesVeres Lajos2013-07-154-12/+12
| | |
| | * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-105-5/+5
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-05-092-1/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
| * | Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstreamAnatol Belski2014-05-092-1/+11
| | | | | | | | | | | | upstream patch applied
* | | Add support for PCRE marksNikita Popov2014-03-172-2/+244
| | | | | | | | | | | | | | | | | | If a MARK is set then it will be returned in the $matches array unter key "MARK". If no MARK is used or passed, the key will not be set.
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-02-043-4/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: pcre tests go with 8.34 upgrade
| * | pcre tests go with 8.34 upgradeAnatol Belski2014-02-043-4/+10
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-02-04104-5746/+22111
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: pcre upgraded to 8.34
| * | pcre upgraded to 8.34Anatol Belski2014-02-04104-5746/+22111
| | |
| * | Bump yearXinchen Hui2014-01-032-2/+2
| | |
| * | typo fixesVeres Lajos2013-07-154-12/+12
| | |
* | | Bump yearXinchen Hui2014-01-032-2/+2
| | |
* | | Avoid interned hash key duplication and hash key length recaclulationDmitry Stogov2013-11-291-4/+6
| | |
* | | typo fixesVeres Lajos2013-07-154-12/+12
|/ /
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-105-5/+5
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter)
| * typo fixes (argument)Veres Lajos2013-06-101-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-03-141-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fix zts check
| * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-03-141-1/+1
| |\ | | | | | | | | | | | | * PHP-5.3: fix zts check
| | * fix zts checkAnatol Belski2013-03-141-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-03-041-1/+8
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed PCRE locale crash in Windows/TS
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-03-041-1/+8
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed PCRE locale crash in Windows/TS
| | * Fixed PCRE locale crash in Windows/TSStephen A. Zarkos2013-03-041-1/+8
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-03-0342-6977/+11909
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: merged PCRE 8.32
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-03-0342-6977/+11909
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: merged PCRE 8.32
| | * merged PCRE 8.32Anatol Belski2013-03-0342-6977/+11909
| | | | | | | | | | | | | | | - defined HAVE_CONFIG_H to simplify the future merges - PCRE NEWS http://pcre.org/news.txt
| | * Happy New Year~Xinchen Hui2013-01-012-2/+2
| | |
| * | Happy New YearXinchen Hui2013-01-012-2/+2
| | |
* | | Happy New YearXinchen Hui2013-01-012-2/+2
| | |
* | | Merge branch 'PHP-5.4'Adam Harvey2012-11-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Update arginfo for preg_match_all() to reflect reality. fix invalid read when trimming empty string
| * | Update arginfo for preg_match_all() to reflect reality.Adam Harvey2012-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Back when I implemented FR #53238 during the 5.4 development phase to make the $matches parameter optional in preg_match_all(), it turns out I forgot to update the arginfo to note that only 2 parameters are now required by preg_match_all(). The function itself works fine, but reflection was reporting the wrong number of required parameters.
* | | Merge branch 'PHP-5.4'Dmitry Stogov2012-10-261-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63180 (Corruption of hash tables) fix bug #63369 Conflicts: NEWS
| * | Fixed bug #63180 (Corruption of hash tables)Dmitry Stogov2012-10-261-0/+18
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-10-1959-28459/+39657
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #63284 PCRE upgrade to 8.31
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-1959-28459/+39657
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #63284 PCRE upgrade to 8.31
| | * Fixed bug #63284 PCRE upgrade to 8.31Anatoliy Belsky2012-10-1959-28459/+39657
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-1/+1
| |\ \ | | |/
| | * indentXinchen Hui2012-10-181-1/+1
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-181-2/+1
|\ \ \ | |/ /