summaryrefslogtreecommitdiff
path: root/ext/pcre
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Optimize argument passing handlers: Fix pcre non-FAST_ZPP build Conflicts: Zend/zend_compile.c Zend/zend_execute.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/pcre/php_pcre.c
| * Fix pcre non-FAST_ZPP buildAndrea Faulds2014-12-161-1/+1
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-132-83/+83
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-2612-16/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-2312-16/+16
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-182-36/+36
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-031-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Initialize the offset table - PCRE may sometimes miss offsets set default response code to 200 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 Conflicts: ext/pcre/php_pcre.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
| | | | |
| * | | | fix datatype mismatchesAnatol Belski2014-10-292-35/+35
| | | | | | | | | | | | | | | | | | | | PCRE uses plain datatypes, no typedefs.
* | | | | fix arg order, CFLAGS is the fifth arg in m4Anatol Belski2014-10-171-1/+1
| | | | |
* | | | | more exts converted for static tsrm ls pointerAnatol Belski2014-10-153-4/+4
|/ / / / | | | | | | | | | | | | mbstring, pcre, reflection
* | | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-192-2/+2
| | | |
* | | | avoid unnecessary strlen calls in loopAnatol Belski2014-09-191-2/+2
| | | |
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-2/+2
| | | |
* | | | master renames phase 2Anatol Belski2014-08-251-1/+1
| | | |
* | | | master renames phase 1Anatol Belski2014-08-251-60/+60
| | | |
* | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-211-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * | | | use a suitable number of patterns to show the bug is resolved, not a stupid ↵krakjoe2014-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | number that could cause memory limit to be exceeded or other side effects
* | | | | Merge branch 'master' of git.php.net:php-srcAnatol Belski2014-08-171-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Veres Lajos (2) and Lior Kaplan (1) # Via Lior Kaplan * 'master' of git.php.net:php-src: Correct typo in comments: 'initialized' typofixes typofixes
| * | | | Merge branch 'PHP-5.6'Lior Kaplan2014-08-171-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: typofixes Conflicts: ext/spl/php_spl.c
| | * | | 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
* | | | | some more pure naming replacementsAnatol Belski2014-08-171-6/+6
| | | | |
* | | | | mostly fixes to spl, but also some otherAnatol Belski2014-08-171-3/+3
| | | | |
* | | | | fix some cases with fast zppAnatol Belski2014-08-161-11/+11
| | | | |
* | | | | several fixes -Anatol Belski2014-08-161-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - param parsing Z_PARAM_STR vs Z_PARAM_STRING - some functions for new params - etc
* | | | | fix macros in the 5 basic extensionsAnatol Belski2014-08-161-19/+19
|/ / / /
* | | | Fast parameter parsing APIDmitry Stogov2014-07-111-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | This API is experemental. It may be changed or removed. It should be used only for really often used functions. (Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
* | | | Fixed compilation warningsDmitry Stogov2014-06-201-6/+4
| | | |
* | | | fixed memory leakDmitry Stogov2014-06-201-1/+3
| | | |
* | | | Avoid unnecessary memory allocation/deallocations and pcre callsDmitry Stogov2014-06-092-112/+200
| | | |
* | | | Bundle pcre-8.35 with sljit supportDmitry Stogov2014-06-0693-1848/+47918
| | | |
* | | | Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-6/+2
| | | |
* | | | Use extended iteration API to avoid in-place modificationDmitry Stogov2014-05-281-3/+4
| | | |
* | | | Merge branch 'master' into phpngDmitry Stogov2014-05-132-1/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (41 commits) fix test - output can be chunked fix test fix test Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6 Add bug fix to NEWS Update UPGRADING according to bug fix fix test improve CURL tests to allow testing without separate server improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions... - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) - Move checking - Fixed missing NULL check in SimpleXMLElement::xpath() - Fixed missing NULL check ... Conflicts: ext/bz2/bz2.c ext/gd/gd.c ext/mbstring/php_mbregex.c ext/session/tests/031.phpt ext/simplexml/simplexml.c ext/spl/spl_fixedarray.c
| * | | 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
* | | | Nested PCRE calls may clobber extra->mark and it has to be reinitailizedDmitry Stogov2014-05-131-4/+4
| | | | | | | | | | | | | | | | This fixes invalid memory writes (detected with valgrind) in Zend/tests/closure_047.phpt and Zend/tests/closure_048.phpt.
* | | | More zend_string usage in PCRENikita Popov2014-04-251-82/+47
| | | | | | | | | | | | | | | | Avoid a few copies and zval duplications
* | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-26109-5752/+22366
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | | 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
| | | |
View Lorry Controller Status