]> granicus.if.org Git - php/log
php
10 years agofix datatype mismatches
Anatol Belski [Wed, 29 Oct 2014 13:33:50 +0000 (14:33 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Wed, 29 Oct 2014 13:28:16 +0000 (14:28 +0100)]
fix datatype mismatches

sizeof(struct _string) doesn't increase.

10 years agofix datatype mismatch
Anatol Belski [Wed, 29 Oct 2014 13:09:30 +0000 (14:09 +0100)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Wed, 29 Oct 2014 12:46:58 +0000 (13:46 +0100)]
fix datatype mismatches

especially spl_dual_it_object current.pos should have the same datatype as
limit.offset, also this doesn't increase the struct size.

10 years agofix datatype mismatches
Anatol Belski [Wed, 29 Oct 2014 12:36:10 +0000 (13:36 +0100)]
fix datatype mismatches

PCRE uses plain datatypes, no typedefs.

10 years agofix the comparison return value
Anatol Belski [Wed, 29 Oct 2014 10:48:29 +0000 (11:48 +0100)]
fix the comparison return value

10 years agofix datatype mismatch
Anatol Belski [Wed, 29 Oct 2014 10:39:54 +0000 (11:39 +0100)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 19:12:20 +0000 (20:12 +0100)]
fix datatype mismatches

10 years agofix datatype mismatch warning
Anatol Belski [Tue, 28 Oct 2014 19:11:53 +0000 (20:11 +0100)]
fix datatype mismatch warning

10 years agofix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 18:59:31 +0000 (19:59 +0100)]
fix datatype mismatches

10 years agofix datatype mismatch warnings
Anatol Belski [Tue, 28 Oct 2014 18:50:06 +0000 (19:50 +0100)]
fix datatype mismatch warnings

10 years agofix datatype mismatch warns
Anatol Belski [Tue, 28 Oct 2014 18:32:51 +0000 (19:32 +0100)]
fix datatype mismatch warns

10 years agofix datatype mismatch warn
Anatol Belski [Tue, 28 Oct 2014 18:29:07 +0000 (19:29 +0100)]
fix datatype mismatch warn

10 years agofix datatype mismatch warnings
Anatol Belski [Tue, 28 Oct 2014 18:25:55 +0000 (19:25 +0100)]
fix datatype mismatch warnings

10 years agofix "inconsistent dll linkage" warning caused by bison
Anatol Belski [Tue, 28 Oct 2014 18:18:47 +0000 (19:18 +0100)]
fix "inconsistent dll linkage" warning caused by bison

stdlib.h might not be always using _STDLIB_H, that will move bison
to redeclare the malloc/free prototypes.

10 years agofix datatype mismatch warnings
Anatol Belski [Tue, 28 Oct 2014 17:43:22 +0000 (18:43 +0100)]
fix datatype mismatch warnings

10 years agoDon't treat warnings as failures in the junit output
Matteo Beccati [Wed, 29 Oct 2014 13:32:41 +0000 (14:32 +0100)]
Don't treat warnings as failures in the junit output

This matches Travis and the actual return code.

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Wed, 29 Oct 2014 10:44:46 +0000 (11:44 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Wed, 29 Oct 2014 10:43:01 +0000 (11:43 +0100)]
Merge phpdbg into PHP-5.6

10 years agoMerge php-src into phpdbg
Bob Weinand [Wed, 29 Oct 2014 10:40:56 +0000 (11:40 +0100)]
Merge php-src into phpdbg

10 years agoMerge branch 'PHP-5.6'
Matteo Beccati [Wed, 29 Oct 2014 10:32:57 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Matteo Beccati [Wed, 29 Oct 2014 10:32:12 +0000 (11:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
configure.in
main/php_version.h

10 years agoFixed test to work with recent libcurl versions
Matteo Beccati [Wed, 29 Oct 2014 10:26:22 +0000 (11:26 +0100)]
Fixed test to work with recent libcurl versions

10 years agoEnable shared builds for webhelper
Bob Weinand [Wed, 29 Oct 2014 10:28:09 +0000 (11:28 +0100)]
Enable shared builds for webhelper

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Wed, 29 Oct 2014 06:26:58 +0000 (07:26 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  cleanup uneeded json

10 years agocleanup uneeded json
Remi Collet [Wed, 29 Oct 2014 06:26:41 +0000 (07:26 +0100)]
cleanup uneeded json

10 years agocleanup uneeded json
Remi Collet [Wed, 29 Oct 2014 06:26:41 +0000 (07:26 +0100)]
cleanup uneeded json

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 22:07:46 +0000 (23:07 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

10 years agoMove missing zend_hash_* macros from phpdbg.h to zend_hash.h
Bob Weinand [Tue, 28 Oct 2014 22:07:36 +0000 (23:07 +0100)]
Move missing zend_hash_* macros from phpdbg.h to zend_hash.h

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 22:06:50 +0000 (23:06 +0100)]
Merge phpdbg into PHP-5.6

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 22:06:50 +0000 (23:06 +0100)]
Merge phpdbg into PHP-5.6

10 years agoRemoved last HAVE_JSON check
Bob Weinand [Tue, 28 Oct 2014 22:06:32 +0000 (23:06 +0100)]
Removed last HAVE_JSON check

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 22:00:10 +0000 (23:00 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

Conflicts:
sapi/phpdbg/phpdbg_wait.c
sapi/phpdbg/phpdbg_webdata_transfer.c

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:44:29 +0000 (22:44 +0100)]
Merge phpdbg into PHP-5.6

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:44:29 +0000 (22:44 +0100)]
Merge phpdbg into PHP-5.6

10 years agoFix versions & config.m4
Bob Weinand [Tue, 28 Oct 2014 21:33:41 +0000 (22:33 +0100)]
Fix versions & config.m4

10 years agoMerge ../phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)]
Merge ../phpdbg into PHP-5.6

Conflicts:
sapi/phpdbg/config.m4

10 years agoMerge ../phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)]
Merge ../phpdbg into PHP-5.6

Conflicts:
sapi/phpdbg/config.m4

10 years agoUse serialize instead of json for transfer
Bob Weinand [Tue, 28 Oct 2014 21:14:35 +0000 (22:14 +0100)]
Use serialize instead of json for transfer

10 years agoAdd webhelper in config.w32
Bob Weinand [Tue, 28 Oct 2014 21:11:30 +0000 (22:11 +0100)]
Add webhelper in config.w32

10 years agoMerge php-src into phpdbg
Bob Weinand [Tue, 28 Oct 2014 20:15:47 +0000 (21:15 +0100)]
Merge php-src into phpdbg

Conflicts:
config.m4

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Tue, 28 Oct 2014 18:13:27 +0000 (19:13 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix phpdbg build when src tree != build tree

10 years agofix phpdbg build when src tree != build tree
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree

10 years agofix phpdbg build when src tree != build tree
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 16:43:15 +0000 (17:43 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

10 years agoMerge ../phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 16:42:38 +0000 (17:42 +0100)]
Merge ../phpdbg into PHP-5.6

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 16:40:27 +0000 (17:40 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

Conflicts:
configure.in
main/php_version.h
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_prompt.c

10 years agoRemove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints

10 years agoRemove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints

10 years agoTypo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)

10 years agoTypo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)

10 years agoFix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run

10 years agoFix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run

10 years agoFix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths

10 years agoFix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths

10 years agoFix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags

10 years agoFix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags

10 years agoFix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks

10 years agoFix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks

10 years ago*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors

10 years ago*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors

10 years agorework fix to php_com_do_invoke_byref,
Anatol Belski [Tue, 28 Oct 2014 16:23:40 +0000 (17:23 +0100)]
rework fix to php_com_do_invoke_byref,

fix crashing function with void arguments

10 years agofix possible zero deref
Anatol Belski [Tue, 28 Oct 2014 16:06:37 +0000 (17:06 +0100)]
fix possible zero deref

10 years agofix error code upcast on x64
Anatol Belski [Tue, 28 Oct 2014 15:52:49 +0000 (16:52 +0100)]
fix error code upcast on x64

10 years agoseveral fixes to com_dotnet for x64
Anatol Belski [Tue, 28 Oct 2014 15:37:04 +0000 (16:37 +0100)]
several fixes to com_dotnet for x64

10 years agoexclude the 32 bit only test
Anatol Belski [Tue, 28 Oct 2014 15:10:27 +0000 (16:10 +0100)]
exclude the 32 bit only test

10 years agoinitialize the input arg lengths
Anatol Belski [Tue, 28 Oct 2014 15:09:17 +0000 (16:09 +0100)]
initialize the input arg lengths

10 years agofix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 09:43:58 +0000 (10:43 +0100)]
fix datatype mismatches

10 years agoconvert API for size_t where zend_string is used under the hood
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

10 years agofix signature, zend_string is used for function name
Anatol Belski [Mon, 27 Oct 2014 18:51:14 +0000 (19:51 +0100)]
fix signature, zend_string is used for function name

10 years agofix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 18:36:29 +0000 (19:36 +0100)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 18:23:03 +0000 (19:23 +0100)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:57:51 +0000 (18:57 +0100)]
fix datatype mismatch

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:49:15 +0000 (18:49 +0100)]
fix datatype mismatch

10 years agofix datatype mismatch warns
Anatol Belski [Mon, 27 Oct 2014 17:46:46 +0000 (18:46 +0100)]
fix datatype mismatch warns

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:42:45 +0000 (18:42 +0100)]
fix datatype mismatch

10 years agoRemove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints

10 years ago5.6.4 now
Julien Pauli [Tue, 28 Oct 2014 15:00:19 +0000 (16:00 +0100)]
5.6.4 now

10 years agoPHP 5.5.20 now
Julien Pauli [Tue, 28 Oct 2014 14:01:53 +0000 (15:01 +0100)]
PHP 5.5.20 now

10 years agoTypo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)

10 years agoFix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run

10 years agoFix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths

10 years agoFix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags

10 years agoFix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks

10 years ago*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors

10 years agoAddtion fix for bug #68252 , forget static variable hanlding
Xinchen Hui [Tue, 28 Oct 2014 09:40:54 +0000 (17:40 +0800)]
Addtion fix for bug #68252 , forget static variable hanlding

10 years agoFixed bug #68252 (segfault in Zend/zend_hash.c in function _zend_hash_del_el)
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

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoEnsure 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.

10 years agoMerge branch 'PHP-5.6'
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()

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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()

10 years agoFix 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.

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:31:38 +0000 (17:31 +0100)]
fix datatype mismatch

10 years agofix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 16:28:01 +0000 (17:28 +0100)]
fix datatype mismatch warnings

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:20:24 +0000 (17:20 +0100)]
fix datatype mismatch

10 years agofix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:16:24 +0000 (17:16 +0100)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 16:15:26 +0000 (17:15 +0100)]
fix datatype mismatches

10 years agofix datatype mismatch warning
Anatol Belski [Mon, 27 Oct 2014 16:04:44 +0000 (17:04 +0100)]
fix datatype mismatch warning

10 years agofix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 16:02:52 +0000 (17:02 +0100)]
fix datatype mismatches