From: Michael Wallner <mike@php.net>
Date: Thu, 3 Jul 2014 18:43:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9fda21667cf6c93d75402bcd4cca224115ca195;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA

Conflicts:
	main/php_content_types.c
---

f9fda21667cf6c93d75402bcd4cca224115ca195