Christoph M. Becker
6855e2f08b
Merge branch 'pull-request/1439'
...
* pull-request/1439:
fixed broken test
add new error constant PREG_JIT_STACKLIMIT_ERROR
2015-07-29 18:21:46 +02:00
Anatol Belski
0787cd60ed
first stone on using the unified globals accessor
2015-07-29 10:36:30 +02:00
Christoph M. Becker
e6f55339cc
add new error constant PREG_JIT_STACKLIMIT_ERROR
2015-07-26 23:40:38 +02:00
Christoph M. Becker
d73287be18
Merge branch 'PHP-5.6'
...
* PHP-5.6:
allow to skip slow tests
2015-07-26 17:35:23 +02:00
Christoph M. Becker
5be8872f44
allow to skip slow tests
2015-07-26 17:33:09 +02:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Dmitry Stogov
4bd22cf1c1
Improved zend_string API (Francois Laupretre)
...
Squashed commit of the following:
commit d96eab8d79
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 b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
2015-06-29 16:44:54 +03:00
Christoph M. Becker
ca049e0ae9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:41:02 +02:00
Christoph M. Becker
e1561c490e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:32:57 +02:00
Christoph M. Becker
23e25f3319
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the 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.
2015-06-23 19:28:09 +02:00
Christoph M. Becker
ec8731c46b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23 16:50:52 +02:00
Christoph M. Becker
bc47f10a97
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23 16:36:35 +02:00
Christoph M. Becker
a39beaa251
Fixed bug #69864 (Segfault in preg_replace_callback)
...
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.
2015-06-23 13:00:17 +02:00
Xinchen Hui
05c24d5dfa
Fixed Bug #69883 (Compilation failed on PCRE)
2015-06-19 20:33:14 +08:00
Xinchen Hui
327e3b338c
Micro optimizations for pcre
2015-06-19 09:56:42 +08:00
Lior Kaplan
7a02d138a6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:36:46 +03:00
Lior Kaplan
3930e1f2fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:35:54 +03:00
Lior Kaplan
ca33ae3eb2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:34:53 +03:00
Lior Kaplan
cc7194dd10
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:30:21 +03:00
Dmitry Stogov
8c8ad8f40e
Use better hash functions (reuse key and avoid hash value recalculation)
2015-06-17 12:06:33 +03:00
Stanislav Malyshev
66153ba153
Merge branch 'PHP-5.6'
...
* 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
2015-05-30 21:19:05 -07:00
Stanislav Malyshev
60c925fd41
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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
2015-05-30 21:18:50 -07:00
Stanislav Malyshev
930fb8b1f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* 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
2015-05-30 21:18:28 -07:00
Stanislav Malyshev
f38ca75a3c
Update PCRE version (bug #69689 )
2015-05-30 21:17:16 -07:00
olshevskiy87
8bdec7a248
fix typos
...
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
2015-05-13 22:28:35 +04:00
Stanislav Malyshev
98fe9405e2
Merge branch 'PHP-5.6'
...
* 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
2015-04-29 22:34:54 -07:00
Stanislav Malyshev
428d0983cd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:28:04 -07:00
Stanislav Malyshev
ce6db558f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:27:21 -07:00
Stanislav Malyshev
95fa727992
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:27:07 -07:00
Anatol Belski
7ccafe40c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"
2015-04-28 14:38:45 +02:00
Anatol Belski
768bbedf82
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix VC9 build with PCRE
2015-04-28 14:38:21 +02:00
Anatol Belski
9c5c3ff022
fix VC9 build with PCRE
2015-04-28 13:15:39 +02:00
Stanislav Malyshev
c34aba472c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Upgrade PCRE to 8.36, it fixes some crashes
Conflicts:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_ucd.c
2015-04-27 23:41:18 -07:00
Stanislav Malyshev
19ad1389aa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b
Upgrade PCRE to 8.36, it fixes some crashes
...
We probably will need to go to 8.37 once it is released.
2015-04-27 23:16:54 -07:00
Xinchen Hui
38d79e9449
Drop unused num index
2015-04-28 11:26:58 +08:00
Dmitry Stogov
770cb1da71
Keep realpath and PCRE caches in consistency with opcache SHM.
2015-04-22 02:29:06 +03:00
Dmitry Stogov
e44ccde39a
"C" is the default locale
2015-04-16 21:44:50 +03:00
Lior Kaplan
3b8b1435ad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix typo: unitialized -> uninitialized
Fix typo: unitialized -> uninitialized
Conflicts:
ext/xmlwriter/php_xmlwriter.c
2015-04-01 18:30:55 +03:00
Lior Kaplan
2fd74c7f03
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix typo: unitialized -> uninitialized
2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7
Fix typo: unitialized -> uninitialized
2015-04-01 18:17:53 +03:00
Andrea Faulds
db76b708cf
Deprecate PHP 4 constructors
2015-03-31 17:55:27 +02:00
Anatol Belski
19360f386e
cleanup mod version macros, round 3
2015-03-23 20:54:55 +01:00
Xinchen Hui
784c60ab6d
Improve test scripts
2015-03-21 21:11:14 +08:00
Xinchen Hui
a4529cc0e5
Fixed memleak
2015-03-21 20:17:04 +08:00
Xinchen Hui
4180226117
More error conditions
2015-03-21 16:54:45 +08:00
Xinchen Hui
2f6dbfc26b
Improved impelmentation(and cleanup behaviro with errors conditions)
2015-03-21 15:56:42 +08:00
Xinchen Hui
c524dd6d1e
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
...
Conflicts:
Zend/zend_vm_gen.php
ext/pcre/php_pcre.c
2015-03-21 14:01:11 +08:00
Anatol Belski
a43a9c9137
use correct api
2015-03-20 17:11:36 +01:00