From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 18 Mar 2019 10:07:27 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.4RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82fbaab53c4ea6fb8417cbad8254b8475e50b4cd;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

82fbaab53c4ea6fb8417cbad8254b8475e50b4cd
diff --cc ext/spl/spl_directory.c
index 946e1cde7d,47b3521d63..7f14ae987c
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@@ -95,10 -97,9 +95,11 @@@ static void spl_filesystem_object_destr
  			} else {
  				php_stream_pclose(intern->u.file.stream);
  			}
+ 			intern->u.file.stream = NULL;
  		}
  		break;
 +	default:
 +		break;
  	}
  } /* }}} */