]> granicus.if.org Git - php/commitdiff
Merge branch 'webdata_transfer'
authorBob Weinand <bobwei9@hotmail.com>
Mon, 6 Oct 2014 22:45:29 +0000 (00:45 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 6 Oct 2014 22:45:29 +0000 (00:45 +0200)
1  2 
phpdbg_list.c
phpdbg_prompt.c

diff --cc phpdbg_list.c
index 96eacd47665c18048b8f40c0335e170bb08b72cf,51dd4dccadd318b867754756d8020acab0144779..6a53b8d5e7d6a50047d7f2899237198bd280745f
@@@ -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);
diff --cc phpdbg_prompt.c
Simple merge