MFB: #20831 fix

diff --git a/main/streams.c b/main/streams.c
index 89288f52e80bc347ece2fc1d303f335503619227..e2583673acefb62508d4ffbb16c886c32d0db1d3 100755 (executable)
--- a/main/streams.c
+++ b/main/streams.c
@@ -1751,7 +1751,16 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, cha
        if (fp) {
                /* sanity checks for include/require */
                if (options & STREAM_OPEN_FOR_INCLUDE && (fstat(fileno(fp), &st) == -1 || !S_ISREG(st.st_mode))) {
-                       goto err;
+                       int is_unc = 0;
+
+#ifdef PHP_WIN32
+                       /* skip the sanity check; fstat doesn't appear to work on
+                        * UNC paths */
+                       is_unc = (filename[0] == '\\' && filename[1] == '\\');
+#endif
+                       if (!is_unc) {
+                               goto err;
+                       }
                } 
        
                ret = php_stream_fopen_from_file_rel(fp, mode);
@@ -2317,7 +2326,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
                                return stream;
                        case PHP_STREAM_RELEASED:
 #if ZEND_DEBUG
-                               newstream->__orig_path = estrdup(copy_of_path);
+                               newstream->__orig_path = estrdup(path);
 #endif
                                return newstream;
                        default:
@@ -2339,8 +2348,9 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
        }
        tidy_wrapper_error_log(wrapper TSRMLS_CC);
 #if ZEND_DEBUG
-       if (stream == NULL && copy_of_path != NULL)
+       if (stream == NULL && copy_of_path != NULL) {
                efree(copy_of_path);
+       }
 #endif
        return stream;
 }