From: Anatol Belski <ab@php.net>
Date: Sun, 8 Mar 2015 19:31:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'weltling/libmagic_upgrade'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~762
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a44ed26dcf924db56890e9dc333b8fa2da0cc062;p=php

Merge remote-tracking branch 'weltling/libmagic_upgrade'

* weltling/libmagic_upgrade: (29 commits)
  partially revert wrong merge
  after merge fix
  updated libmagic.patch
  catching up
  catching up
  regenerated data file
  more after patch fixes
  restore good patch parts
  stat is done by php
  use zend_strndup
  started to patch for libmagic.next
  fix test outputs
  catch up with the previous cve-2014-3538 patch
  catching up
  catching up
  catching up
  updated the test magic file
  add patchlevel info
  portable off_t
  regenerated data file
  ...
---

a44ed26dcf924db56890e9dc333b8fa2da0cc062