]> granicus.if.org Git - php/commitdiff
Merge branch '2Guploads'
authorMichael Wallner <mike@php.net>
Fri, 9 Aug 2013 09:47:25 +0000 (11:47 +0200)
committerMichael Wallner <mike@php.net>
Fri, 9 Aug 2013 09:47:25 +0000 (11:47 +0200)
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage

1  2 
configure.in
ext/hash/config.m4
ext/mysqlnd/config9.m4

diff --cc configure.in
Simple merge
Simple merge
Simple merge