]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a99e7ee 88c1ce3)
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Thu, 3 Jul 2014 18:43:12 +0000 (20:43 +0200)
committerMichael Wallner <mike@php.net>
Thu, 3 Jul 2014 18:43:12 +0000 (20:43 +0200)
commitf9fda21667cf6c93d75402bcd4cca224115ca195
treecf37d352927fceccfeedda3db3a0507ea10e9d40tree | snapshot
parenta99e7eeab9bddbbd548660e53f129084a1650deacommit | diff
parent88c1ce3203608d85a18db823729f3d7034b01660commit | diff
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
main/SAPI.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.