From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 6 Oct 2014 22:45:29 +0000 (+0200)
Subject: Merge branch 'webdata_transfer'
X-Git-Tag: php-5.6.3RC1~51^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f584e22fe6ef71bd73be9c8287c8aec11d0d279;p=php

Merge branch 'webdata_transfer'
---

6f584e22fe6ef71bd73be9c8287c8aec11d0d279
diff --cc phpdbg_list.c
index 96eacd4766,51dd4dccad..6a53b8d5e7
--- a/phpdbg_list.c
+++ b/phpdbg_list.c
@@@ -244,9 -244,8 +244,9 @@@ zend_op_array *phpdbg_compile_file(zend
  	fake.handle.stream.mmap.buf = data.buf;
  	fake.handle.stream.mmap.len = data.len;
  	fake.free_filename = 0;
- 	fake.opened_path = NULL;
+ 	fake.opened_path = file->opened_path;
  	fake.filename = filename;
 +	fake.opened_path = file->opened_path;
  
  	*(dataptr = emalloc(sizeof(phpdbg_file_source) + sizeof(uint) * data.len)) = data;
  	zend_hash_add(&PHPDBG_G(file_sources), filename, strlen(filename), &dataptr, sizeof(phpdbg_file_source *), NULL);