com php-src: Merge branch 'webdata_transfer': phpdbg _list.c phpdbg_prompt.c

From: Date: Mon, 06 Oct 2014 22:45:29 +0000
Subject: com php-src: Merge branch 'webdata_transfer': phpdbg _list.c phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82578@lists.php.net to get a copy of this message
Commit: 6f584e22fe6ef71bd73be9c8287c8aec11d0d279 Author: Bob Weinand <bobwei9@hotmail.com> Tue, 7 Oct 2014 00:45:29 +0200 Parents: 8b6d707df079529d4bf13098aa7f2b9686c14e59 c55dbad54672e0c8c8979f87f4a6250f7d11dc34 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6f584e22fe6ef71bd73be9c8287c8aec11d0d279 Log: Merge branch 'webdata_transfer' Changed paths: MM phpdbg_list..c MM phpdbg_prompt.c Diff: diff --cc phpdbg_list.c index 96eacd4,51dd4dc..6a53b8d --- 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);

« previous php.cvs (#82578) next »