Add new 'use function' sequence for importing namespaced functions #526

Merged
merged 791 commits into from Dec 6, 2013
@igorw

Replacement for #388, all of the issues have been resolved.

This is specified as the use_function RFC:

m6w6 and others added some commits Aug 9, 2013
@m6w6 m6w6 use $YACC instead of 'bison' as suggested by Yasuo
Conflicts:
	Zend/acinclude.m4
1fe1f73
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 30d64b0
@laruence laruence Merge branch 'PHP-5.5' 9a2aa11
@rlerdorf rlerdorf Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
adcd481
@rlerdorf rlerdorf Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
6919d15
@rlerdorf rlerdorf Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
55b16f4
@laruence laruence Need a way to check whether this API exists 4d7d856
@laruence laruence Merge branch 'PHP-5.5' b96bee6
@laruence laruence Revert "Need a way to check whether this API exists"
hmm, we can check whether the head file exists instead

This reverts commit 4d7d856.
d42fa2a
@laruence laruence Merge branch 'PHP-5.5' e1f9993
@kaplanlior kaplanlior Use minus sign instead of hyphen df501fd
@kaplanlior kaplanlior Typo fix: managment -> management a55d3b9
@nikic nikic Use zend_error_noreturn for all E_COMPILE_ERRORs 64caedd
@nikic nikic Fix assignment in dummy_encoding_list_parser a1ae79e
@nikic nikic Fix misleading sizeof
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
1292091
@nikic nikic Remove dead comparison (size_t < 0) 870d3e7
@nikic nikic Remove extraneous NULL check of Z_ARRVAL_P()
Z_ARRVAL_P() is never NULL
9b46a15
@rlerdorf rlerdorf Initialize these to make Coverity happy 813e867
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
26b2776
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
12aa4aa
@rlerdorf rlerdorf Trivial Coverity fix 4a20509
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Trivial Coverity fix
259c746
@rlerdorf rlerdorf Fix unitialized opened_path here - found by Coverity 2be67ca
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized opened_path here - found by Coverity
1ce0004
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix unitialized opened_path here - found by Coverity
6650bed
@felipensp felipensp - Fixed possible memory leak aa4f9b3
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible memory leak
c1f2217
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible memory leak
07361a4
@felipensp felipensp - Moved allocation to if block to make Coverity happy 85a622e
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Moved allocation to if block to make Coverity happy
0b5c288
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved allocation to if block to make Coverity happy
39e746a
@felipensp felipensp - Fix possible memory leak 420068c
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fix possible memory leak
8d22c23
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix possible memory leak
84011f7
@felipensp felipensp - Fix extern declaration according to definition a1daebe
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fix extern declaration according to definition
0d6247f
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix extern declaration according to definition
ab7b0f9
@rlerdorf rlerdorf Remove senseless check here fb38fdc
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove senseless check here
683a7d7
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove senseless check here
eb616f8
@felipensp felipensp - Fixed possible uninitialized scalar variable usage (spotted by Cove…
…rity)
33d377e
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
df31eb8
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
b7c6468
@felipensp felipensp Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 b6feabc
@felipensp felipensp - Fixed possible NULL ptr dereference 52555a7
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible NULL ptr dereference
5b0560e
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible NULL ptr dereference
d23f089
@felipensp felipensp - Moved NULL check before dereferencing 9976b5c
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Moved NULL check before dereferencing
8aa19c9
@felipensp felipensp Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved NULL check before dereferencing
048923b
@rlerdorf rlerdorf Minor Coverity tweaks 1494298
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Minor Coverity tweaks
c5e5a6c
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Minor Coverity tweaks
32a729a
@rlerdorf rlerdorf Clean up this weird safe_emalloc() call 8f4a6d6
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Clean up this weird safe_emalloc() call
288a4ec
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up this weird safe_emalloc() call
7b2a4c1
@rlerdorf rlerdorf These getpwnam('') tests are silly and not portable 2129de4
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  These getpwnam('') tests are silly and not portable
73e65ea
@rlerdorf rlerdorf Fix typo 18cc538
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typo
9e4651f
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix typo
7ccffee
@smalyshev smalyshev 5.4.21 release date 9aad911
@smalyshev smalyshev fix possibility of access to *storedType without initialization 646813a
@smalyshev smalyshev Fix coverity issue with -1 returned by findOffset not being handled b…
…y getPreferredTag
dab1d76
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
42cb9ac
@rlerdorf rlerdorf When src->src is null this doesn't get initialized
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
2186e15
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
910d475
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
ec2e695
@smalyshev smalyshev fix const warnings in intl methods ef9069b
@smalyshev smalyshev fix argument type & remove warning 8bef8e6
@smalyshev smalyshev Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
8f19a8d
@smalyshev smalyshev 5.4.21 release date 27ebcb8
@smalyshev smalyshev Fix coverity issue with -1 returned by findOffset not being handled b…
…y getPreferredTag
2973241
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
0069792
@smalyshev smalyshev fix possibility of access to *storedType without initialization 219a682
@smalyshev smalyshev Fix coverity issue with -1 returned by findOffset not being handled b…
…y getPreferredTag
444612c
@smalyshev smalyshev fix const warnings in intl methods 06954d1
@smalyshev smalyshev fix argument type & remove warning 3900ce9
@smalyshev smalyshev Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
ae31a68
@smalyshev smalyshev fix memory leak on error (from Coverity scan) f860486
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix memory leak on error (from Coverity scan)
cb47396
@smalyshev smalyshev Merge branch 'PHP-5.5'
* PHP-5.5:
  fix memory leak on error (from Coverity scan)
19e8052
@laruence laruence Fixed issue #115 (path issue when using phar). 0988554
@laruence laruence Merge branch 'PHP-5.5' aed56fc
@m6w6 m6w6 Merge branch 'master' of https://github.com/DylanArnold/php-src
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
41da537
@m6w6 m6w6 Merge branch 'master' of https://github.com/guggemand/php-src
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
454a9fc
@m6w6 m6w6 Just SKIP that test on travis 2ecf94e
@dstogov dstogov Fixed compilation warning 60ce381
@m6w6 m6w6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Just SKIP that test on travis
825174e
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilation warning
02214e7
@m6w6 m6w6 remove TRAVIS check in test source fb610b4
@m6w6 m6w6 Merge branch 'PHP-5.5'
* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
6764993
@m6w6 m6w6 Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5
* refs/remotes/origin/PHP-5.5:
  Fixed compilation warning
e78c536
@m6w6 m6w6 Merge remote-tracking branch 'refs/remotes/origin/master'
* refs/remotes/origin/master:
  Fixed compilation warning
4ddbb7d
@tony2001 tony2001 fix bug #65936 (dangling context pointer causes crash)
reported by Leon Sorokin
b636c03
@tony2001 tony2001 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65936 (dangling context pointer causes crash)
605b3c2
@weltling weltling fixed invalid free 8591a52
@m6w6 m6w6 Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
	Draal
Conflicts:
	configure.in
	main/php_version.h
1b43f95
@m6w6 m6w6 add tests for bug #62523 2fa5f39
@m6w6 m6w6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
757f4a9
derickr and others added some commits Oct 28, 2013
@derickr derickr Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 7a526f0
@derickr derickr Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 824bac9
@derickr derickr - Updated to version 2013.8 (2013h) ab64819
@derickr derickr Merge branch 'PHP-5.4' into PHP-5.5 ad7793d
@derickr derickr Merge branch 'PHP-5.5' f626db1
@nikic nikic Avoid copy in func_get_arg()
Complements dmitry's change to func_get_args()
d86b5f0
Yasuo Ohgaki Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  - Updated to version 2013.8 (2013h)
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
69808d6
@remicollet remicollet add bundled libzip LICENSE, as required by BSD License terms e2c9f39
@remicollet remicollet Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add bundled libzip LICENSE, as required by BSD License terms
a7fc8ee
@remicollet remicollet Merge branch 'PHP-5.5'
* PHP-5.5:
  add bundled libzip LICENSE, as required by BSD License terms
141b77d
Yasuo Ohgaki Fixed Bug 64760 var_export() does not use full precision for floating…
…-point numbers
4dc4302
Yasuo Ohgaki Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
49b3fef
Yasuo Ohgaki Update NEWS 16a9fec
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
d04bcb8
Yasuo Ohgaki Update NEWS 4c45e95
Yasuo Ohgaki Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (22 commits)
  add bundled libzip LICENSE, as required by BSD License terms
  Avoid copy in func_get_arg()
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - test3
  - test commit 2
  - test commit1
  ldap_escape() notes
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  ...
5c89d5a
Yasuo Ohgaki Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
3cf2682
Yasuo Ohgaki Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  add bundled libzip LICENSE, as required by BSD License terms
0d89265
Yasuo Ohgaki Implemented Change crypt() behavior w/o salt RFC 416f8fc
@weltling weltling updated libs_versions.txt 5f1cbfa
@weltling weltling Merge branch 'PHP-5.5'
* PHP-5.5:
  updated libs_versions.txt
4295bfe
@weltling weltling Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 e17de5e
@nikic nikic Fix ZTS build 82eca38
@nikic nikic Fix compile warning in GMP 647e0be
@nikic nikic Fix bug #65997 by switching to Serializable for GMP
Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.
4218e89
@smalyshev smalyshev 5.4.23-dev 4ded6ee
@srgoogleguy srgoogleguy Merge branch 'pull-request/287'
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
98c9e56
@weltling weltling back to do_alloca(), reverted the wrong replacement fc707a2
@weltling weltling compact the code to preserve the error info after state freeing abb962d
Yasuo Ohgaki Add crypt() change in UPGRADING 832c826
@dstogov dstogov Removed unnecessary GC checks 3b2ca39
@rlerdorf rlerdorf Fix bug #66008 b4bed6f
@rlerdorf rlerdorf Fix bug #66008 812dfbc
@rlerdorf rlerdorf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #66008
a0244a6
@tony2001 tony2001 add news entry about FPM backlog change
and move the other entry to its proper place
7cd5ae6
@weltling weltling simplify the state free macros 4d430ec
@weltling weltling removed unnecessary call f1c2f8f
@weltling weltling back to do_alloca() 39e7dcc
@mhujer mhujer Typo fix: umknown -> unknown 55ee543
@kaplanlior kaplanlior Typo fix: umknown -> unknown d3fd163
@rlerdorf rlerdorf Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (107 commits)
  Typo fix: umknown -> unknown
  add news entry about FPM backlog change
  Fix bug #66008
  updated libs_versions.txt
  Update NEWS
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  ...
bb42643
@weltling weltling virtual_cwd_activate() should be called only in one place 6aedfac
@weltling weltling reverted the previous commit, both calls are needed in TS mode 9df78bf
@weltling weltling limit virtual_cwd_activate() duplicated call to ZTS only 699f07b
@rlerdorf rlerdorf Fix English here e5e25c4
@laruence laruence Fixed coredump due to abnormal implemention of phar 3d4ef50
@laruence laruence Merge branch 'PHP-5.5' 15eabbb
@laruence laruence Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 a07ae67
@laruence laruence Merge branch 'master' of git.php.net:php-src 2f555b8
@remicollet remicollet Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
5dc37b3
@remicollet remicollet NEWS + UPGRADING 5b8ae01
@pierrejoye pierrejoye Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff
bf875e2
@laruence laruence Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2b7e89e
@laruence laruence Fixed Bug #66034 (Segmentation Fault when constructor of PDO statemen…
…t throws an exception)

I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
e3d9e18
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	configure.in
	ext/mysqlnd/mysqlnd.c
	main/php_version.h
d4f5ca4
@laruence laruence Update NEWS 906d3ae
@laruence laruence Merge branch 'PHP-5.5' 2a94494
@laruence laruence Remove outdate codes, make it clearer, although just a bit.. 63dba7e
@laruence laruence Merge branch 'PHP-5.5'
Conflicts:
	ext/phar/phar_internal.h
	ext/phar/stream.c
	ext/phar/util.c
6c8ff00
@weltling weltling Merge branch 'pull-request/500'
* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
	ext/opcache/ZendAccelerator.c
c675980
@weltling weltling updated NEWS c4cfdfa
George Wang Fixed typo in Makefile.frag 3720fd7
George Wang Update LiteSpeed SAPI code to V6.4 01bc132
@laruence

2007?

@nikic

This commit seems to break indentation (tabs->spaces).

laruence and others added some commits Nov 6, 2013
@laruence laruence Revert "Fixed issue #115 (path issue when using phar)."
We need another better way to fix this

This reverts commit 0988554.

Conflicts:
	ext/opcache/ZendAccelerator.c
9d75b9f
@laruence laruence Merge branch 'PHP-5.5'
Conflicts:
	ext/opcache/ZendAccelerator.c
c76be56
Christopher Jones Cleanup temp test file c439ac6
@ptarjan ptarjan fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
9c1e1bb
@ptarjan ptarjan fix missing change from 'tcp_socket' to the more common 'server' 290becb
@sgolemon sgolemon Add a couple more test cases to parse_url() tests
http://::# (valid but silly)
http://#   (invalid)
8b6b39f
@Tyrael Tyrael Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt
9110881
@Tyrael Tyrael Merge branch 'PHP-5.5' d87388b
@Tyrael Tyrael bump API versions 929bf11
@rlerdorf rlerdorf Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  Fixed coredump due to abnormal implemention of phar
  Typo fix: umknown -> unknown
  Fix bug #66008
  5.4.23-dev
  remove "PHP 6" staff
54fe719
@rlerdorf rlerdorf Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (65 commits)
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  Typo fix: umknown -> unknown
  Fix bug #66008
  5.4.23-dev
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  remove "PHP 6" staff
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Fix Coverity issue reporting wrong sizeof()
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  Just SKIP that test on travis
  ...
8cb1281
@rlerdorf rlerdorf Fix bug #65946 - pdo_sql_parser.c permanently converts values bound t…
…o strings
890ea84
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

Conflicts:
	ext/pdo/pdo_sql_parser.c
b3d522d
@rlerdorf rlerdorf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
756dc19
@rlerdorf rlerdorf NEWS entry 224dc52
@rlerdorf rlerdorf NEWS entry caab951
@laruence laruence Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes
fd3fa9b
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 41eb3c9
@laruence laruence Update NEWS f345152
@laruence laruence Fixed bug #65947 (basename is no more working after fgetcsv in certai…
…n situation)

previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#

it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:

memset (ps,0,sizeof(*ps));  // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
cf2626f
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 5f17c4d
@laruence laruence Update NEWS 717268c
@dstogov dstogov Added tests for PHAR/OPCahce incompatibilities 49fbe25
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry

Conflicts:
	NEWS
4e6a0bd
@dstogov dstogov Fixed issue #115 (path issue when using phar).
Fixed issue #149 (Phar mount points not working with OPcache enabled).
915c428
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
0e5c507
@igorw igorw Merge remote-tracking branch 'upstream/PHP-5.6' into use-function
* upstream/PHP-5.6: (399 commits)
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
  bump API versions
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  ...

Conflicts:
	Zend/zend_compile.h
24e0b99
@igorw igorw Merge pull request #4 from LawnGnome/use-function
FIX ALL THE THINGS
719db1a
@igorw igorw Merge remote-tracking branch 'lgnome/use-function' into use-function
* lgnome/use-function:
  Only check user functions for filenames.
eb063e0
@sgolemon sgolemon commented on an outdated diff Nov 9, 2013
Zend/zend_compile.c
@@ -7058,9 +7126,118 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{
}
/* }}} */
+void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */
+{
+ char *lookup_name;
+ zval *name, *ns, tmp;
+ zend_bool warn = 0;
+
+ ALLOC_ZVAL(ns);
+ *ns = ns_name->u.constant;
@sgolemon
sgolemon added a line comment Nov 9, 2013

ZVAL_ZVAL(ns, &ns_name->u.constant, 0, 0);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@sgolemon sgolemon commented on an outdated diff Nov 9, 2013
Zend/zend_compile.c
+ ALLOC_ZVAL(ns);
+ *ns = ns_name->u.constant;
+ if (new_name) {
+ name = &new_name->u.constant;
+ } else {
+ const char *p;
+
+ /* The form "use A\B" is eqivalent to "use A\B as B".
+ So we extract the last part of compound name to use as a new_name */
+ name = &tmp;
+ p = zend_memrchr(Z_STRVAL_P(ns), '\\', Z_STRLEN_P(ns));
+ if (p) {
+ ZVAL_STRING(name, p+1, 1);
+ } else {
+ *name = *ns;
+ zval_copy_ctor(name);
@sgolemon
sgolemon added a line comment Nov 9, 2013

ZVAL_ZVAL(name, ns, 1, 0);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@php-pulls php-pulls merged commit 611da37 into php:PHP-5.6 Dec 6, 2013

1 check passed

Details default The Travis CI build passed
@Tyrael
php.net member

I've merged it to 5.6 and master, thank you for the contribution!

@odoucet

Why is this patch from 3 months ago, and not commited in any PHP version released on december ? This patch seems fine to me, and mandatory to handle large file uploads.

I believe this might be for the upcoming PHP-5.6.

Any particular reason why it is not merged with 5.3 / 5.4 or 5.5 version ?

You're asking the wrong person, I had nothing to do with this change. :)

Because it only fixes an issue in PHP-5.6+ which comes with +2G-upload support..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment