Merge commit '5753b74' into PHP-5.5

* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
Merge commit 'e55f08a' into PHP-5.5

* commit 'e55f08a':
  This test will only work if gc is enabled
Merge commit 'ea75b1b' into PHP-5.5

* commit 'ea75b1b':
  This test needs local infile enabled
Merge commit 'd60e168' into PHP-5.5

* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?
Merge commit 'a03f094' into PHP-5.5

* commit 'a03f094':
  We shouldn't load any local ini files for these tests
Fix phar phpinfo test after markup changes
This doesn't fail in 5.5 anymore
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes
Merge commit '626d96a'

* commit '626d96a':
  This doesn't fail in 5.5 anymore
fix typo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix typo
non living code related typo fixes
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  non living code related typo fixes
Strict session
Strict session. Detect session id collision
fix crash, enable session_id and fix test
fix compiler warning, use longs for hashes
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix compiler warning, use longs for hashes