Dont reset other counters when incrementing slow_rq
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  fix using wrong buffer pointer
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  bump version
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
Add new 'use function' sequence for importing namespaced functions

This is specified as the use_function RFC:

* https://wiki.php.net/rfc/use_function
Correctly distinguish between functions and constants

So far 'use function' applied to both constants and functions. This
patch correctly separates the two.
Import namespaced constants via new 'use const' sequence
Add test case for conflicting use and use function alias (stas)
Removed assumption that \\ will be present

The function zend_add_ns_func_name_literal is called if the parser finds a function that is not in the global or current namespace. It assumes such a function will have a \\ in it, which is no longer true with the use function patch. The code change above removes that assumption and makes the test work:
PASS use and use function with the same alias [Zend/tests/use_function/conflicting_use_alias.phpt]
More test cases for conflicting aliases
Add test cases for conflicting use and definition in same ns (stas)
Compile error on function definition conflicting with import
Disallow using functions/consts defined in the same file

* Keep track of defined function and const filenames
* Prohibit use function foo if function foo exists
* Prohibit use const foo if const foo exists
Compile error on const definition conflicting with import
Adjust some test names, remove obsolete and duplicate tests (nikic)
self and parent are valid function and const names (nikic)
Comment nitpick (nikic)
Handle case sensivity of constants (nikic)
Add test for conditional function declaration
Fix issue with global fallback when not in global space
Fix issue with global fallback not in global space