Dont reset other counters when incrementing slow_rq
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
Call php_module_shutdown() for php-fpm child processes
Add ldap_escape()
Fix compiler warnings in openssl.c
Fix 100.64 IPv4 Range Check
Fix RFC 6598 IPv4 Range
Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src

* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
  Add ldap_escape()
fix compiler warnings and type usage
Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src

* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src:
  Fix compiler warnings in openssl.c
use $YACC instead of 'bison' as suggested by Yasuo

Conflicts:
	Zend/acinclude.m4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Need a way to check whether this API exists
Merge branch 'PHP-5.5'
Revert "Need a way to check whether this API exists"

hmm, we can check whether the head file exists instead

This reverts commit 4d7d85640dd8e48166e4fd5dbf04aeb18a9e01c4.
Merge branch 'PHP-5.5'