From: Michael Wallner <mike@php.net>
Date: Tue, 13 Aug 2013 15:08:01 +0000 (+0200)
Subject: Merge branch 'master' into slim-postdata
X-Git-Tag: php-5.6.0alpha1~211^2~11^2~8^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fddc82dd0ebb4f7bb24921682251b79970315fbf;p=php

Merge branch 'master' into slim-postdata

* master: (62 commits)
  removed unused vars
  fixed strndup usage in the pgsql ext
  Fixes to unified stdint usage
  Fixed bug #65382 (Segfault in closure_030.phpt)
  Revise pgsql test files
  Revise pgsql test for Travis CI
  Add 00version.phpt to get server/protocol/client version. Revise test script description
  use mysqlnd, some tests fail otherwise
  ensure notices are not ignored when tests need them
  Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
  Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
  Adds files: error 1 to 5 and variation 1 to 4
  Fix #61345: fix install of CGI binary
  Fix #61345: fix install of CGI binary
  php.ini-development/production: remove php_zip.dll
  Update NEWS
  Update NEWS
  Fixed possible buffer overflow under Windows. Note: Not a security fix.
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
  Implemented Request #20421 (session_abort() and session_reset() function
  ...

Conflicts:
	sapi/cli/tests/upload_2G.phpt
---

fddc82dd0ebb4f7bb24921682251b79970315fbf