Fix bug #66773, #66862
authorNikita Popov <nikic@php.net>
Sat, 8 Oct 2016 14:56:17 +0000 (16:56 +0200)
committerNikita Popov <nikic@php.net>
Sat, 8 Oct 2016 15:00:27 +0000 (17:00 +0200)
commit2a75f5026a47099f585e29c5a9d8a2989dab42af
treebc19f0670ba87ca271f27cba1be2fb6d1a9d477a
parent159de7723edb9cfb597e743494aeb83b6584b5d4
Fix bug #66773, #66862

This a partial backport of 8754b19. It
a) fixes the class/function/constant import table confusion in the
   namespaced case, and
b) restricts conflict checks to a single file based on a filename
   pointer comparison.

It does not fix the issues with filename reuse (e.g. due to eval)
and late-bound classes. This part of the change requires globals
changes.
NEWS
Zend/tests/use_function/no_conflict_with_classes.phpt [new file with mode: 0644]
Zend/tests/use_no_file_conflict.phpt [new file with mode: 0644]
Zend/tests/use_no_file_conflict_1.inc [new file with mode: 0644]
Zend/tests/use_no_file_conflict_2.inc [new file with mode: 0644]
Zend/zend_compile.c