1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Commit Graph

8 Commits

Author SHA1 Message Date
Bob Weinand 89a0d3c2b2 Merge branch 'master' into xml-protocol
Conflicts:
	phpdbg_lexer.c
	phpdbg_prompt.c
2014-10-08 00:27:12 +02:00
krakjoe 4b3a11debb make build work moar 2014-10-07 12:36:03 +01:00
Bob Weinand 8bc2881260 Merge branch 'master' into xml-protocol
Conflicts:
	phpdbg.c
	phpdbg.h
	phpdbg_cmd.c
	phpdbg_cmd.h
	phpdbg_frame.c
	phpdbg_info.c
	phpdbg_list.c
	phpdbg_print.c
	phpdbg_prompt.c
	phpdbg_utils.c
	phpdbg_utils.h
	phpdbg_watch.c
2014-10-07 13:08:30 +02:00
Bob Weinand c55dbad546 Disable automatic resetting of imported auto_globals 2014-10-05 02:27:51 +02:00
Bob Weinand f48fc67c86 Fix (system) ini entry transfer 2014-10-05 00:16:19 +02:00
Bob Weinand 19cdad194b Add transfer of output back to webserver and merge master in
Conflicts:
	config.m4
	phpdbg.c
	phpdbg.h
	phpdbg_cmd.c
	phpdbg_prompt.c
2014-10-04 23:21:34 +02:00
Bob Weinand cccc75eef9 Do not unload phpdbg module in any case 2014-09-10 17:01:08 +02:00
Bob Weinand 554b30389e Fix segfaults, reorder files and set filename to exec 2014-09-10 16:03:26 +02:00