Nikita Popov
4cf90e06c9
Fix lexing of nested heredoc strings in token_get_all()
...
This fixes bug #60097 .
Before two global variables CG(heredoc) and CG(heredoc_len) were used to
track the current heredoc label. In order to support nested heredoc
strings the *previous* heredoc label was assigned as the token value of
T_START_HEREDOC and the language_parser.y assigned that to CG(heredoc).
This created a dependency of the lexer on the parser. Thus the
token_get_all() function, which accesses the lexer directly without
also running the parser, was not able to tokenize nested heredoc strings
(and leaked memory). Same applies for the source-code highlighting
functions.
The new approach is to maintain a heredoc_label_stack in the lexer, which
contains all active heredoc labels.
As it is no longer required, T_START_HEREDOC and T_END_HEREDOC now don't
carry a token value anymore.
In order to make the work with zend_ptr_stack in this context more
convenient I added a new function zend_ptr_stack_top(), which retrieves the
top element of the stack (similar to zend_stack_top()).
2012-03-31 21:53:30 +02:00
Christopher Jones
8b2a51c62c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Add php.ini parameter checks for OCI8
2012-03-30 16:18:15 -07:00
Christopher Jones
aa774a51d5
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add php.ini parameter checks for OCI8
2012-03-30 16:17:37 -07:00
Christopher Jones
c56cfbd234
Add php.ini parameter checks for OCI8
...
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
2012-03-30 16:12:25 -07:00
Shein Alexey
babe3ee0d2
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 17:25:49 +05:00
Shein Alexey
c02aa086c6
Resolved conflict.
2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c
Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3
...
* fix-debug-build-bug61115-1.phpt:
Fixed bug61115-1.phpt for debug build version.
2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416
Fixed bug61115-1.phpt for debug build version.
2012-03-29 16:51:45 +05:00
Yasuo Ohgaki
48033ed48d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 20:06:00 +09:00
Yasuo Ohgaki
8449e0ca89
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 20:04:15 +09:00
Yasuo Ohgaki
aecf5485e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:55:06 +09:00
Yasuo Ohgaki
931831bf75
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
2012-03-29 19:48:58 +09:00
Johannes Schlüter
21fa9634c1
Merge remote branch 'security/PHP-5.3' into PHP-5.3
...
* security/PHP-5.3:
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
2012-03-29 10:54:08 +02:00
Gustavo André dos Santos Lopes
fc4482fd5e
Merge branch '5.4'
2012-03-29 08:48:13 +01:00
Gustavo André dos Santos Lopes
f4873c68a6
Merge branch '5.3' into 5.4
...
Conflicts:
main/output.c
2012-03-29 08:47:58 +01:00
Jille Timmermans
710335b2a3
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
...
This reverts commit 4aeabaf8e9
.
2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
...
This reverts commit 55b1e61242
.
2012-03-29 08:44:19 +01:00
Gustavo André dos Santos Lopes
57af2875dc
Revert "Merge branch 'pull-request/24'" (apply correct workflow)
...
This reverts commit a00b447b34
, reversing
changes made to 48daddf093
.
2012-03-29 08:41:51 +01:00
Stanislav Malyshev
fe79276371
Merge branch 'sec54' into PHP-5.4
...
* sec54:
update NEWS
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
2012-03-28 21:16:04 -07:00
Jille Timmermans
4aeabaf8e9
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:19 +09:00
Jille Timmermans
55b1e61242
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:07 +09:00
Yasuo Ohgaki
a00b447b34
Merge branch 'pull-request/24'
...
* pull-request/24:
ext/pcntl/pcntl.c: Fix typo in comment
2012-03-29 09:06:04 +09:00
Anatoliy Belsky
a83d84279b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:43:45 +02:00
Anatoliy Belsky
92bca7436f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:32:24 +02:00
Anatoliy Belsky
eeab3be303
Fix bug #61459 popen_close_basic-win32 can't run sort.exe
2012-03-28 19:25:29 +02:00
Anatoliy Belsky
40bbc7a1ed
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:25:23 +02:00
Anatoliy Belsky
fa0d507923
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:13:16 +02:00
Anatoliy Belsky
bff8152565
Fix bug #61401 ext\openssl\tests\004.phpt fails
2012-03-28 17:11:58 +02:00
Anatoliy Belsky
b905167458
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:23:46 +02:00
Jille Timmermans
51e9365bb9
ext/pcntl/pcntl.c: Fix typo in comment
...
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-28 16:18:23 +02:00
Anatoliy Belsky
4c5b427124
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:15:36 +02:00
Anatoliy Belsky
bd7bb973b1
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:04:56 +02:00
Anatoliy Belsky
bd928f0592
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 15:07:01 +02:00
Anatoliy Belsky
a715a21594
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 14:53:28 +02:00
Anatoliy Belsky
fa7f215d19
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Fixed problem introduced in a763929
(fixing bug #61347 ).
2012-03-28 14:51:16 +02:00
Gustavo André dos Santos Lopes
a9121819d0
Merge remote branch 'origin/PHP-5.4' into 5.4
2012-03-28 13:13:52 +01:00
Gustavo André dos Santos Lopes
4fa0c2a963
Merge remote branch 'origin/PHP-5.3' into 5.3
2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes
8319e99e5d
Merge branch 'master' of git.php.net:/php-src
2012-03-28 13:06:49 +01:00
Gustavo André dos Santos Lopes
e6b23547c1
Merge branch '5.4'
2012-03-28 13:06:36 +01:00
Gustavo André dos Santos Lopes
593578c8c1
Merge branch '5.3' into 5.4
2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes
f07dd29fdc
Fixed problem introduced in a763929
(fixing bug #61347 ).
...
The test added in 8c44c85
should now pass.
2012-03-28 13:04:41 +01:00
Anatoliy Belsky
105a9a9d45
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 14:01:14 +02:00
Anatoliy Belsky
103995ba22
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 13:59:51 +02:00
Anatoliy Belsky
2ceafc7e33
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 13:19:45 +02:00
Anatoliy Belsky
d406f2b034
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:56:17 +02:00
Anatoliy Belsky
0b20329aaf
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:54:19 +02:00
Anatoliy Belsky
17241a9983
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:11:29 +02:00
Anatoliy Belsky
4f23ee8f5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:10:25 +02:00
Anatoliy Belsky
11f04c3524
Bug 61504 updated libmagic.patch
2012-03-28 12:06:09 +02:00