Anatol Belski
11b119d526
fix datatype mismatches
2014-10-27 16:38:47 +01:00
Anatol Belski
82c36cf5e8
fix datatype mismatches
2014-10-27 16:38:46 +01:00
Anatol Belski
73ecac89e1
fix datatype mismatches and warnings
2014-10-27 16:38:45 +01:00
Anatol Belski
b983929652
fix datatype mismatch warnings
2014-10-27 16:38:44 +01:00
Anatol Belski
ae06555003
fix datatype mismatch warnings
2014-10-27 16:38:42 +01:00
Anatol Belski
ac964fbe30
fix datatype mismatches
2014-10-27 16:38:41 +01:00
Anatol Belski
b0d86d87d8
fix datatype mismatches
2014-10-27 16:38:40 +01:00
Anatol Belski
5b5e2d3d45
fix datatype mismatch warnings
2014-10-27 16:38:39 +01:00
Anatol Belski
8fdaeef8e8
fix datatype mismatches
2014-10-27 16:38:38 +01:00
Bob Weinand
baba4254ce
Merge remote-tracking branch 'origin/PHP-5.6'
...
Conflicts:
sapi/phpdbg/phpdbg_bp.c
2014-10-27 14:32:58 +01:00
Bob Weinand
0ede82d466
Merge phpdbg into PHP-5.6
2014-10-27 14:07:26 +01:00
Bob Weinand
2297a9aa01
Fix resolving breakpoints of already loaded files
2014-10-27 13:55:20 +01:00
Bob Weinand
8b98ffea5f
Never exist xml mode...
2014-10-27 13:27:54 +01:00
Bob Weinand
a3ae401524
Merge remote-tracking branch 'origin/PHP-5.6'
2014-10-27 13:19:33 +01:00
Bob Weinand
6eab2b9101
Merge phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 13:11:13 +01:00
Bob Weinand
b4db856d37
Fix failing quit when quitting during execution
2014-10-27 11:02:08 +01:00
Bob Weinand
9139d031d8
Fix segfault when cleaning without execution context
2014-10-27 11:01:43 +01:00
Bob Weinand
5e8359d360
Fix listening on port
2014-10-27 10:49:16 +01:00
Anatol Belski
08684a9828
Merge branch 'master' of github.com:krakjoe/phpdbg
...
Conflicts:
phpdbg_prompt.c
2014-10-27 10:19:59 +01:00
Anatol Belski
0e7987c61a
improve the current sigio handling on win32
2014-10-27 10:08:58 +01:00
Remi Collet
2233625e02
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
2014-10-27 07:53:54 +01:00
Remi Collet
cc91072f0e
NEWS
2014-10-27 07:51:50 +01:00
Remi Collet
0146505187
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
2014-10-27 07:50:42 +01:00
Remi Collet
88527e4569
NEWS
2014-10-27 07:47:18 +01:00
Remi Collet
3c925b18fa
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
...
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
2014-10-27 07:45:34 +01:00
Rasmus Lerdorf
c8e1fae17f
Fix off-by-one here
2014-10-26 16:59:17 -07:00
Rasmus Lerdorf
8d84b1f67a
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (240 commits)
Do not execute anything after quit or clean command
Fix last commit, and do not output unnecessary information
Stabilize execution, always run destructors and extended file breakpoints
Fix nullptr dereference in clean without exec context
remove dodgy param parser, bring userland breakpoint api inline with PHP7
disable output buffering by default
Add question to reset execution in run/exec/clean
- Updated to version 2014.9 (2014i)
actually remove this
disable output buffering, better breakpoint api for userland, remove hand parsing of params
Fix phpdbg output when outputting via php with active output handlers
Fixed Closure::call() NEWS/UPGRADING
Set engine back to initial state after fatal-ed ev command
Fix eventual stack overflow after clean cmd
Fix listing of files with no absolute path
updated libmagic.patch in master
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
NEWS
NEWS
...
2014-10-26 16:58:45 -07:00
Bob Weinand
09da8952d0
Merge remote-tracking branch 'origin/PHP-5.6'
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_parser.c
sapi/phpdbg/phpdbg_parser.h
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 00:34:56 +01:00
Bob Weinand
50756b515c
Do not execute anything after quit or clean command
2014-10-27 00:00:19 +01:00
Bob Weinand
190f4f9f18
Fix last commit, and do not output unnecessary information
2014-10-27 00:00:18 +01:00
Bob Weinand
3ab7734b88
Stabilize execution, always run destructors and extended file breakpoints
2014-10-27 00:00:16 +01:00
Bob Weinand
69bc61de41
Fix nullptr dereference in clean without exec context
2014-10-27 00:00:15 +01:00
krakjoe
41537cdddc
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-27 00:00:14 +01:00
krakjoe
51c1cc4ff5
disable output buffering by default
2014-10-27 00:00:14 +01:00
Bob Weinand
cc70ec1e67
Add question to reset execution in run/exec/clean
2014-10-27 00:00:13 +01:00
Bob Weinand
f4748ff9ff
Do not execute anything after quit or clean command
2014-10-26 23:33:54 +01:00
Bob Weinand
29edee4e70
Fix last commit, and do not output unnecessary information
2014-10-26 22:21:18 +01:00
Bob Weinand
05711d9961
Stabilize execution, always run destructors and extended file breakpoints
2014-10-26 20:43:49 +01:00
Derick Rethans
9e62255c62
Merge branch 'PHP-5.6'
2014-10-26 11:07:48 -04:00
Derick Rethans
25e3560546
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-26 10:54:09 -04:00
Derick Rethans
22b9f16e9a
- Updated to version 2014.9 (2014i)
2014-10-26 10:54:07 -04:00
Bob Weinand
1ff04117c3
Fix nullptr dereference in clean without exec context
2014-10-26 10:48:45 +01:00
krakjoe
65eaab52b6
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-26 07:24:35 +00:00
krakjoe
5feb96520a
disable output buffering by default
2014-10-26 07:08:29 +00:00
krakjoe
8ba69820f7
actually remove this
2014-10-26 07:05:55 +00:00
krakjoe
29446f2f04
disable output buffering, better breakpoint api for userland, remove hand parsing of params
2014-10-26 07:02:15 +00:00
Bob Weinand
918466c262
Add question to reset execution in run/exec/clean
2014-10-26 03:50:28 +01:00
Bob Weinand
044f37a832
Merge remote-tracking branch 'origin/PHP-5.6'
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_list.c
2014-10-25 19:09:19 +02:00
Bob Weinand
24babb0194
Merge phpdbg into PHP-5.6
2014-10-25 18:59:48 +02:00
Bob Weinand
bbcee18b4b
Fix phpdbg output when outputting via php with active output handlers
2014-10-25 18:48:43 +02:00