Merge branch 'PHP-7.2'

* PHP-7.2:
  fileinfo: fix misleading indentation in libmagic
This commit is contained in:
Anatol Belski 2017-12-21 15:42:16 +01:00
commit aa978538ca

View File

@ -2909,7 +2909,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
if (dbname == NULL)
goto error;
stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
if (!stream) {
goto error;