diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-08-12 16:35:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-08-12 16:35:41 +0800 |
| commit | dd618664a09dd81d8b8c44d6329bf5b8459cd173 (patch) | |
| tree | 6530b7cbee054cbb5fac27f36ed55c0a07f2a680 /ext | |
| parent | 3467526a65bfb15eaf9ec49a0b5673b84e26bca4 (diff) | |
| parent | fe41f87e468f8ae5ab68f9e4abfd58fa4bbc3f9d (diff) | |
| download | php-git-dd618664a09dd81d8b8c44d6329bf5b8459cd173.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72813 (Segfault with __get returned by ref)
Fix URL rewriter partially
Conflicts:
Zend/zend_object_handlers.c
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.re
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/url_scanner_ex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 04a55e22cd..880332ead7 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.3 */ +/* Generated by re2c 0.13.5 */ #line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ @@ -1018,7 +1018,7 @@ yy60: if (yybm[0+yych] & 64) { goto yy59; } - if (yych <= '\'') goto yy62; + if (yych <= '=') goto yy62; yy61: YYCURSOR = YYMARKER; goto yy52; @@ -1035,7 +1035,7 @@ yy65: if (yybm[0+yych] & 128) { goto yy64; } - if (yych >= '#') goto yy61; + if (yych >= '>') goto yy61; ++YYCURSOR; #line 559 "ext/standard/url_scanner_ex.re" { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; } |