]> granicus.if.org Git - php/commit
Merge branch 'pull-request/31'
authorStanislav Malyshev <stas@php.net>
Mon, 20 Aug 2012 04:42:28 +0000 (21:42 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 20 Aug 2012 04:43:04 +0000 (21:43 -0700)
commit3336e1e78c48cabf51c1a502ac84f20cd732981f
tree7b058968ef6f0a66f299d19970f80f594abdb221
parentd2521fc42c407a1eb1c6a4feb0da5f88e58bd5ed
parent4cf90e06c9834a52195384da760503ea055c726d
Merge branch 'pull-request/31'

* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()
Zend/zend_compile.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
ext/tokenizer/tests/bug60097.phpt