zip extension version 1.12.4
Merge branch 'PHP-5.6'

* PHP-5.6:
  zip extension version 1.12.4
Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
Merge branch 'master' of git.php.net:php-src

Conflicts:
	ext/openssl/xp_ssl.c
fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04
Fixed build breakage from b4b4d9697f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed build breakage from b4b4d9697f
Fixed bug data->fd not set to -1 for open_basedir failure.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug data->fd not set to -1 for open_basedir failure.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug data->fd not set to -1 for open_basedir failure.
tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
Merge branch 'PHP-5.6'

* PHP-5.6:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed