From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 12 Nov 2014 10:23:24 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~20^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f1b412e5a434304289b523266f2d47483d21f84;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
  Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit.

Conflicts:
	ext/session/session.c
---

1f1b412e5a434304289b523266f2d47483d21f84