Anatol Belski
f7bb3b5cbd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
2017-01-07 02:05:37 +01:00
Mitch Hagstrand
4568618030
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
...
This reverts commit e55e93a1e3
.
This change should only apply to master. Not PHP-7.0 or PHP-7.1
2017-01-07 02:04:03 +01:00
Joe Watkins
c50f61b9b0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Test request47456.phpt for PR 1303
2017-01-06 16:22:58 +00:00
Mitch Hagstrand
e55e93a1e3
Test request47456.phpt for PR 1303
...
After merging PR 1303 unmatched subpatterns are set to NULL
2017-01-06 16:22:11 +00:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Christoph M. Becker
09085ac02c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-26 16:09:45 +01:00
Christoph M. Becker
003727d851
Fix #73612 : preg_*() may leak memory
...
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
2016-11-26 15:34:27 +01:00
Xinchen Hui
0f5d03025f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
Fix #73219 (fix acinclude when / is present)
make it possible to show specific help pages without interactive session
Conflicts:
acinclude.m4
2016-11-20 15:46:53 +08:00
Xinchen Hui
ebfd93f725
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
2016-11-20 15:44:27 +08:00
Xinchen Hui
6b671ca3ed
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Skip if no jit is built
2016-10-29 14:23:47 +08:00
Xinchen Hui
66caa61188
Skip if no jit is built
2016-10-29 14:23:25 +08:00
Xinchen Hui
7778bdcd04
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73392 (A use-after-free in zend allocator management)
2016-10-28 21:21:35 +08:00
Xinchen Hui
e5aa365147
Fixed bug #73392 (A use-after-free in zend allocator management)
2016-10-28 21:21:24 +08:00
Nikita Popov
b1fc1fb937
Normalize preg_replace_callback() return value
...
One particular error case was returning the argument without
casting to string.
2016-10-15 23:58:26 +02:00
Anatol Belski
dd604015be
rename publicly exposed symbol to avoid name conflicts
...
(cherry picked from commit 730288ae41
)
2016-10-14 02:08:14 +02:00
Stanislav Malyshev
0362d61ab7
Fix potential overflows in php_pcre_replace_impl
...
(cherry picked from commit 9c50ba42d6
)
2016-10-14 01:57:55 +02:00
Anatol Belski
730288ae41
rename publicly exposed symbol to avoid name conflicts
2016-10-13 15:23:50 +02:00
Stanislav Malyshev
9c50ba42d6
Fix potential overflows in php_pcre_replace_impl
2016-10-12 23:07:47 -07:00
Anatol Belski
f7e5481a10
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
2016-09-23 01:55:17 +02:00
Anatol Belski
54d8053ac5
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
2016-09-23 01:52:42 +02:00
Andrea Faulds
fc5497cb92
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-11 22:46:20 +01:00
Andrea Faulds
d690014bf3
Remove zpp fallback code (always use Fast ZPP)
...
Squashed commit of the following:
commit 3e27fbb3d2
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100
Keep dummy FAST_ZPP macro for compatibility
commit 8a7cfd00de
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100
Remove FAST_ZPP macro and plain zpp fallback code
2016-09-11 22:44:46 +01:00
Christoph M. Becker
68d3501381
Merge branch 'pull-request/2115' into PHP-7.1
2016-09-06 14:14:23 +02:00
Stanislav Malyshev
9650b8e241
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:39:01 -07:00
Stanislav Malyshev
92db92c620
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:38:57 -07:00
Christoph M. Becker
39423e425d
Implement #47456 : Missing PCRE option 'J'
...
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).
[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php >
2016-09-05 00:30:48 -07:00
Christoph M. Becker
727b422ad9
Fix #72948 : Uncatchable "Catchable" fatal error for class to string conversions
...
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
2016-09-03 13:05:37 +02:00
Anatol Belski
a747578497
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix possible memory leak
2016-08-29 15:29:52 +02:00
Anatol Belski
1d7ec685c1
fix possible memory leak
2016-08-29 15:28:09 +02:00
Anatol Belski
db9baae4fb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
Revert "upgraded to PCRE 8.39"
2016-07-31 15:00:18 +02:00
Anatol Belski
5f9df47ea8
Revert "upgraded to PCRE 8.39"
...
This reverts commit 2fba646837
.
PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.
2016-07-31 14:55:17 +02:00
Christoph M. Becker
15f94e93e7
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-27 19:06:36 +02:00
Christoph M. Becker
40afd77826
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/pcre/php_pcre.c
2016-07-27 19:00:38 +02:00
Christoph M. Becker
315c0536c2
Fix #72688 : preg_match missing group names in matches
...
We have to multiply with 0x100 to properly scale the high byte.
2016-07-27 18:50:52 +02:00
Anatol Belski
2fba646837
upgraded to PCRE 8.39
...
(cherry picked from commit 9d4fe9672a
)
2016-07-26 15:07:04 +02:00
Matteo Beccati
e2e72e1f5c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Rewrite test to avoid sending emails
2016-07-06 07:10:10 +02:00
Matteo Beccati
ff7c981d19
Rewrite test to avoid sending emails
...
A properly configured email server was generating bounce emails when running
the test.
2016-07-06 07:08:43 +02:00
Anatol Belski
4ac29543d6
Merge branch 'PHP-7.0'
...
* PHP-7.0:
yet another test rewrite
2016-06-23 09:42:50 +02:00
Anatol Belski
056c2ce349
yet another test rewrite
2016-06-23 09:42:17 +02:00
Xinchen Hui
dad500ef6a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72476 (Memleak in jit_stack)
2016-06-23 14:07:08 +08:00
Xinchen Hui
bd74e7d013
Fixed bug #72476 (Memleak in jit_stack)
2016-06-23 14:06:48 +08:00
Anatol Belski
0b0758cc31
Merge branch 'PHP-7.0'
...
* PHP-7.0:
rewrite test
2016-06-22 19:47:59 +02:00
Anatol Belski
4edbac6ec5
rewrite test
2016-06-22 19:46:02 +02:00
Anatol Belski
d20372cf6c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72463 mail fails with invalid argument
2016-06-22 19:10:57 +02:00
Anatol Belski
e453904251
Fixed bug #72463 mail fails with invalid argument
2016-06-22 19:06:33 +02:00
Anatol Belski
9d4fe9672a
upgraded to PCRE 8.39
2016-06-19 20:38:31 +02:00
Xinchen Hui
0b3a4c6101
Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)""
...
obviously I read the change is in argument lists by mistake :<
This reverts commit 9e7afa7514
.
2016-05-16 06:22:13 -07:00
Xinchen Hui
9e7afa7514
Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"
...
ABI break
This reverts commit fb951553be
.
2016-05-16 11:24:16 +08:00
Joe Watkins
90f46f2c5b
fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
2016-05-14 08:21:32 +01:00