]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 28 Oct 2014 15:52:49 +0000 (16:52 +0100)]
fix error code upcast on x64
Anatol Belski [Tue, 28 Oct 2014 15:37:04 +0000 (16:37 +0100)]
several fixes to com_dotnet for x64
Anatol Belski [Tue, 28 Oct 2014 15:10:27 +0000 (16:10 +0100)]
exclude the 32 bit only test
Anatol Belski [Tue, 28 Oct 2014 15:09:17 +0000 (16:09 +0100)]
initialize the input arg lengths
Anatol Belski [Tue, 28 Oct 2014 09:43:58 +0000 (10:43 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 09:43:10 +0000 (10:43 +0100)]
convert API for size_t where zend_string is used under the hood
Anatol Belski [Mon, 27 Oct 2014 18:51:14 +0000 (19:51 +0100)]
fix signature, zend_string is used for function name
Anatol Belski [Mon, 27 Oct 2014 18:36:29 +0000 (19:36 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 18:23:03 +0000 (19:23 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 17:57:51 +0000 (18:57 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:49:15 +0000 (18:49 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:46:46 +0000 (18:46 +0100)]
fix datatype mismatch warns
Anatol Belski [Mon, 27 Oct 2014 17:42:45 +0000 (18:42 +0100)]
fix datatype mismatch
Xinchen Hui [Tue, 28 Oct 2014 09:40:54 +0000 (17:40 +0800)]
Addtion fix for bug #68252 , forget static variable hanlding
Xinchen Hui [Tue, 28 Oct 2014 09:36:03 +0000 (17:36 +0800)]
Fixed bug #68252 (segfault in Zend/zend_hash.c in function _zend_hash_del_el)
Don't leave a UNDEF gap in function_table
Remi Collet [Tue, 28 Oct 2014 07:51:22 +0000 (08:51 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Ensure we have enough input data before parsing date
Remi Collet [Tue, 28 Oct 2014 07:50:48 +0000 (08:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Ensure we have enough input data before parsing date
Remi Collet [Tue, 28 Oct 2014 07:48:22 +0000 (08:48 +0100)]
Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=
ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
Stanislav Malyshev [Tue, 28 Oct 2014 02:10:43 +0000 (19:10 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #68095 - invalid read in php_getopt()
Stanislav Malyshev [Tue, 28 Oct 2014 02:07:32 +0000 (19:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #68095 - invalid read in php_getopt()
Stanislav Malyshev [Tue, 28 Oct 2014 02:04:46 +0000 (19:04 -0700)]
Fix bug #68095 - invalid read in php_getopt()
It's a hacky solution and incomplete, but I don't see other way
without refactoring the whole getopt protocol.
Anatol Belski [Mon, 27 Oct 2014 16:31:38 +0000 (17:31 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:28:01 +0000 (17:28 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 16:20:24 +0000 (17:20 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:16:24 +0000 (17:16 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:15:26 +0000 (17:15 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 16:04:44 +0000 (17:04 +0100)]
fix datatype mismatch warning
Anatol Belski [Mon, 27 Oct 2014 16:02:52 +0000 (17:02 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 15:38:05 +0000 (16:38 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 12:20:16 +0000 (13:20 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 12:18:09 +0000 (13:18 +0100)]
fix datatype mismatch warns
Anatol Belski [Mon, 27 Oct 2014 12:17:37 +0000 (13:17 +0100)]
catch up with zend_html_puts
Anatol Belski [Mon, 27 Oct 2014 12:15:47 +0000 (13:15 +0100)]
fix datatype mismatches and warns
Anatol Belski [Mon, 27 Oct 2014 12:08:21 +0000 (13:08 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:27:57 +0000 (12:27 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:21:00 +0000 (12:21 +0100)]
fix datatype mismatches and warnings
Anatol Belski [Mon, 27 Oct 2014 11:08:57 +0000 (12:08 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 11:07:44 +0000 (12:07 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 11:03:05 +0000 (12:03 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:00:25 +0000 (12:00 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 10:52:17 +0000 (11:52 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 10:50:49 +0000 (11:50 +0100)]
fix datatype mismatches
Bob Weinand [Mon, 27 Oct 2014 13:32:58 +0000 (14:32 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg_bp.c
Bob Weinand [Mon, 27 Oct 2014 13:07:26 +0000 (14:07 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Mon, 27 Oct 2014 12:55:20 +0000 (13:55 +0100)]
Fix resolving breakpoints of already loaded files
Bob Weinand [Mon, 27 Oct 2014 12:27:54 +0000 (13:27 +0100)]
Never exist xml mode...
Bob Weinand [Mon, 27 Oct 2014 12:19:33 +0000 (13:19 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Mon, 27 Oct 2014 12:11:13 +0000 (13:11 +0100)]
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
Bob Weinand [Mon, 27 Oct 2014 10:02:08 +0000 (11:02 +0100)]
Fix failing quit when quitting during execution
Bob Weinand [Mon, 27 Oct 2014 10:01:43 +0000 (11:01 +0100)]
Fix segfault when cleaning without execution context
Bob Weinand [Mon, 27 Oct 2014 09:44:01 +0000 (10:44 +0100)]
Fix listening on port
Anatol Belski [Mon, 27 Oct 2014 09:19:59 +0000 (10:19 +0100)]
Merge branch 'master' of github.com:krakjoe/phpdbg
Conflicts:
phpdbg_prompt.c
Anatol Belski [Mon, 27 Oct 2014 09:08:58 +0000 (10:08 +0100)]
improve the current sigio handling on win32
Remi Collet [Mon, 27 Oct 2014 06:53:54 +0000 (07:53 +0100)]
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
Remi Collet [Mon, 27 Oct 2014 06:51:50 +0000 (07:51 +0100)]
NEWS
Remi Collet [Mon, 27 Oct 2014 06:50:42 +0000 (07:50 +0100)]
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
Remi Collet [Mon, 27 Oct 2014 06:47:18 +0000 (07:47 +0100)]
NEWS
Remi Collet [Mon, 27 Oct 2014 06:45:34 +0000 (07:45 +0100)]
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
Rasmus Lerdorf [Sun, 26 Oct 2014 23:59:17 +0000 (16:59 -0700)]
Fix off-by-one here
Rasmus Lerdorf [Sun, 26 Oct 2014 23:58:45 +0000 (16:58 -0700)]
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
...
Bob Weinand [Sun, 26 Oct 2014 23:34:56 +0000 (00:34 +0100)]
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
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints
Derick Rethans [Sun, 26 Oct 2014 15:07:48 +0000 (11:07 -0400)]
Merge branch 'PHP-5.6'
Derick Rethans [Sun, 26 Oct 2014 14:54:09 +0000 (10:54 -0400)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Sun, 26 Oct 2014 14:54:07 +0000 (10:54 -0400)]
- Updated to version 2014.9 (2014i)
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default
krakjoe [Sun, 26 Oct 2014 07:05:55 +0000 (07:05 +0000)]
actually remove this
krakjoe [Sun, 26 Oct 2014 07:02:15 +0000 (07:02 +0000)]
disable output buffering, better breakpoint api for userland, remove hand parsing of params
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean
Bob Weinand [Sat, 25 Oct 2014 17:09:19 +0000 (19:09 +0200)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_list.c
Bob Weinand [Sat, 25 Oct 2014 16:59:48 +0000 (18:59 +0200)]
Merge phpdbg into PHP-5.6
Bob Weinand [Sat, 25 Oct 2014 16:48:43 +0000 (18:48 +0200)]
Fix phpdbg output when outputting via php with active output handlers
Andrea Faulds [Sat, 25 Oct 2014 16:06:11 +0000 (17:06 +0100)]
Merge branch 'Closure_apply'
* Closure_apply:
Fixed Closure::call() NEWS/UPGRADING
Andrea Faulds [Sat, 25 Oct 2014 16:05:52 +0000 (17:05 +0100)]
Fixed Closure::call() NEWS/UPGRADING
Bob Weinand [Sat, 25 Oct 2014 13:29:54 +0000 (15:29 +0200)]
Set engine back to initial state after fatal-ed ev command
Bob Weinand [Sat, 25 Oct 2014 13:28:41 +0000 (15:28 +0200)]
Fix eventual stack overflow after clean cmd
Bob Weinand [Sat, 25 Oct 2014 13:06:34 +0000 (15:06 +0200)]
Fix listing of files with no absolute path
Anatol Belski [Sat, 25 Oct 2014 11:01:17 +0000 (13:01 +0200)]
stdint will be included in the win32 variant, so don't do it twice
Anatol Belski [Sat, 25 Oct 2014 10:06:17 +0000 (12:06 +0200)]
updated libmagic.patch in master
Anatol Belski [Sat, 25 Oct 2014 10:05:34 +0000 (12:05 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
Anatol Belski [Sat, 25 Oct 2014 10:04:27 +0000 (12:04 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.5
Anatol Belski [Sat, 25 Oct 2014 10:03:49 +0000 (12:03 +0200)]
updated libmagic.patch in 5.6
Anatol Belski [Sat, 25 Oct 2014 10:01:58 +0000 (12:01 +0200)]
updated libmagic.patch in 5.5
Remi Collet [Sat, 25 Oct 2014 09:31:54 +0000 (11:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Remi Collet [Sat, 25 Oct 2014 09:30:53 +0000 (11:30 +0200)]
NEWS
Remi Collet [Sat, 25 Oct 2014 09:30:29 +0000 (11:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Remi Collet [Sat, 25 Oct 2014 09:29:53 +0000 (11:29 +0200)]
NEWS
Remi Collet [Wed, 22 Oct 2014 13:37:04 +0000 (15:37 +0200)]
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Upstream commit
https://github.com/file/file/commit/
39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
(cherry picked from commit
1803228597e82218a8c105e67975bc50e6f5bf0d )
STANLEY SUFFICOOL [Sat, 25 Oct 2014 03:30:18 +0000 (20:30 -0700)]
Update PDO_DBLIB README file