]> granicus.if.org Git - php/log
php
10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
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

10 years agoDo not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command

10 years agoFix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information

10 years agoStabilize execution, always run destructors and extended file breakpoints
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints

10 years agoFix nullptr dereference in clean without exec context
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context

10 years agoremove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7

10 years agodisable output buffering by default
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default

10 years agoAdd question to reset execution in run/exec/clean
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean

10 years agoMerge branch 'PHP-5.6'
Derick Rethans [Sun, 26 Oct 2014 15:07:48 +0000 (11:07 -0400)]
Merge branch 'PHP-5.6'

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

10 years ago- Updated to version 2014.9 (2014i)
Derick Rethans [Sun, 26 Oct 2014 14:54:07 +0000 (10:54 -0400)]
- Updated to version 2014.9 (2014i)

10 years agoactually remove this
krakjoe [Sun, 26 Oct 2014 07:05:55 +0000 (07:05 +0000)]
actually remove this

10 years agodisable output buffering, better breakpoint api for userland, remove hand parsing...
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

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
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

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Sat, 25 Oct 2014 16:59:48 +0000 (18:59 +0200)]
Merge phpdbg into PHP-5.6

10 years agoFix phpdbg output when outputting via php with active output handlers
Bob Weinand [Sat, 25 Oct 2014 16:48:43 +0000 (18:48 +0200)]
Fix phpdbg output when outputting via php with active output handlers

10 years agoMerge branch 'Closure_apply'
Andrea Faulds [Sat, 25 Oct 2014 16:06:11 +0000 (17:06 +0100)]
Merge branch 'Closure_apply'

* Closure_apply:
  Fixed Closure::call() NEWS/UPGRADING

10 years agoFixed Closure::call() NEWS/UPGRADING
Andrea Faulds [Sat, 25 Oct 2014 16:05:52 +0000 (17:05 +0100)]
Fixed Closure::call() NEWS/UPGRADING

10 years agoSet engine back to initial state after fatal-ed ev command
Bob Weinand [Sat, 25 Oct 2014 13:29:54 +0000 (15:29 +0200)]
Set engine back to initial state after fatal-ed ev command

10 years agoFix eventual stack overflow after clean cmd
Bob Weinand [Sat, 25 Oct 2014 13:28:41 +0000 (15:28 +0200)]
Fix eventual stack overflow after clean cmd

10 years agoFix listing of files with no absolute path
Bob Weinand [Sat, 25 Oct 2014 13:06:34 +0000 (15:06 +0200)]
Fix listing of files with no absolute path

10 years agoupdated libmagic.patch in master
Anatol Belski [Sat, 25 Oct 2014 10:06:17 +0000 (12:06 +0200)]
updated libmagic.patch in master

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

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

10 years agoupdated libmagic.patch in 5.6
Anatol Belski [Sat, 25 Oct 2014 10:03:49 +0000 (12:03 +0200)]
updated libmagic.patch in 5.6

10 years agoupdated libmagic.patch in 5.5
Anatol Belski [Sat, 25 Oct 2014 10:01:58 +0000 (12:01 +0200)]
updated libmagic.patch in 5.5

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

10 years agoNEWS
Remi Collet [Sat, 25 Oct 2014 09:30:53 +0000 (11:30 +0200)]
NEWS

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

10 years agoNEWS
Remi Collet [Sat, 25 Oct 2014 09:29:53 +0000 (11:29 +0200)]
NEWS

10 years agoFix bug #68283: fileinfo: out-of-bounds read in elf note headers
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)

10 years agoUpdate PDO_DBLIB README file
STANLEY SUFFICOOL [Sat, 25 Oct 2014 03:30:18 +0000 (20:30 -0700)]
Update PDO_DBLIB README file

10 years agoFixed Bug #52885 - PDO_DBLIB: Binary data may be truncated
STANLEY SUFFICOOL [Sat, 25 Oct 2014 03:10:04 +0000 (20:10 -0700)]
Fixed Bug #52885 - PDO_DBLIB: Binary data may be truncated

Data containing characters in conflict with the server
codepage or containing null char will throw an error.
Implement binary quoting to allow binding of binary values.

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
STANLEY SUFFICOOL [Sat, 25 Oct 2014 03:00:48 +0000 (20:00 -0700)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (164 commits)
  refix the broken place
  fix infinite loop
  fix datatype mismatch warnings
  fix datatype mismatches
  fix datatype mismatches
  fix datatype mismatches
  fix datatype mismatch warnings
  fix datatype mismatch warnings
  fix datatype mismatch warnings
  fix datatype mismatch warning
  fix datatype mismatches
  fix datatype mismatch warnings
  Re-add phpdbg to travis
  Added some NEWS
  Make xml valid (missing space between attrs)
  Fix info classes file name in xml
  Add note about <eval> tag for errors in xml.md
  Name the tag <eval> if the error id during ev cmd
  Do not print out xml as PHP print...
  Fix output to wrong function
  ...

10 years agorefix the broken place
Anatol Belski [Sat, 25 Oct 2014 00:13:44 +0000 (02:13 +0200)]
refix the broken place

typecast from signed to unsigned of a bigger size

10 years agofix infinite loop
Anatol Belski [Fri, 24 Oct 2014 22:32:45 +0000 (00:32 +0200)]
fix infinite loop

10 years agofix datatype mismatch warnings
Anatol Belski [Fri, 24 Oct 2014 18:57:38 +0000 (20:57 +0200)]
fix datatype mismatch warnings

10 years agofix datatype mismatches
Anatol Belski [Fri, 24 Oct 2014 18:49:32 +0000 (20:49 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Fri, 24 Oct 2014 18:47:26 +0000 (20:47 +0200)]
fix datatype mismatches

and convert APIs to size_t where zend_string internally used

10 years agofix datatype mismatches
Anatol Belski [Fri, 24 Oct 2014 18:35:28 +0000 (20:35 +0200)]
fix datatype mismatches

and convert len args to size_t where the underlaying API uses zend_string

10 years agofix datatype mismatch warnings
Anatol Belski [Fri, 24 Oct 2014 18:27:56 +0000 (20:27 +0200)]
fix datatype mismatch warnings

10 years agofix datatype mismatch warnings
Anatol Belski [Fri, 24 Oct 2014 11:20:55 +0000 (13:20 +0200)]
fix datatype mismatch warnings

10 years agofix datatype mismatch warnings
Anatol Belski [Fri, 24 Oct 2014 11:12:59 +0000 (13:12 +0200)]
fix datatype mismatch warnings

10 years agofix datatype mismatch warning
Anatol Belski [Fri, 24 Oct 2014 11:00:33 +0000 (13:00 +0200)]
fix datatype mismatch warning

10 years agofix datatype mismatches
Anatol Belski [Fri, 24 Oct 2014 08:09:46 +0000 (10:09 +0200)]
fix datatype mismatches

10 years agofix datatype mismatch warnings
Anatol Belski [Fri, 24 Oct 2014 07:22:51 +0000 (09:22 +0200)]
fix datatype mismatch warnings

10 years agoRe-add phpdbg to travis
Bob Weinand [Fri, 24 Oct 2014 17:32:35 +0000 (19:32 +0200)]
Re-add phpdbg to travis

10 years agoMade phpdbg compatible with new engine
Bob Weinand [Fri, 24 Oct 2014 17:29:50 +0000 (19:29 +0200)]
Made phpdbg compatible with new engine

10 years agoAdded some NEWS
Bob Weinand [Fri, 24 Oct 2014 17:26:04 +0000 (19:26 +0200)]
Added some NEWS

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Fri, 24 Oct 2014 17:22:45 +0000 (19:22 +0200)]
Merge phpdbg into PHP-5.6

10 years agoMake xml valid (missing space between attrs)
Bob Weinand [Fri, 24 Oct 2014 12:42:18 +0000 (14:42 +0200)]
Make xml valid (missing space between attrs)

10 years agoFix info classes file name in xml
Bob Weinand [Fri, 24 Oct 2014 12:29:06 +0000 (14:29 +0200)]
Fix info classes file name in xml

10 years agoAdd note about <eval> tag for errors in xml.md
Bob Weinand [Fri, 24 Oct 2014 12:18:02 +0000 (14:18 +0200)]
Add note about <eval> tag for errors in xml.md

10 years agoName the tag <eval> if the error id during ev cmd
Bob Weinand [Fri, 24 Oct 2014 12:16:49 +0000 (14:16 +0200)]
Name the tag <eval> if the error id during ev cmd

10 years agoDo not print out xml as PHP print...
Bob Weinand [Fri, 24 Oct 2014 11:11:14 +0000 (13:11 +0200)]
Do not print out xml as PHP print...

10 years agoFix output to wrong function
Bob Weinand [Fri, 24 Oct 2014 10:55:44 +0000 (12:55 +0200)]
Fix output to wrong function

10 years agoFixed parameter order on %.*s
Bob Weinand [Fri, 24 Oct 2014 10:32:48 +0000 (12:32 +0200)]
Fixed parameter order on %.*s

10 years agoToo much copypaste...
Bob Weinand [Thu, 23 Oct 2014 18:14:12 +0000 (20:14 +0200)]
Too much copypaste...

10 years agoAdd xml formatted deep dump of return value from ev
Bob Weinand [Thu, 23 Oct 2014 15:19:26 +0000 (17:19 +0200)]
Add xml formatted deep dump of return value from ev

10 years agorework the previous fix for var names with size_t, no ugly casts anymore
Anatol Belski [Thu, 23 Oct 2014 14:50:35 +0000 (16:50 +0200)]
rework the previous fix for var names with size_t, no ugly casts anymore

10 years agoadd include for usleep() proto
Anatol Belski [Thu, 23 Oct 2014 14:49:47 +0000 (16:49 +0200)]
add include for usleep() proto

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 14:38:25 +0000 (16:38 +0200)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Thu, 23 Oct 2014 14:31:19 +0000 (16:31 +0200)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 14:29:02 +0000 (16:29 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 14:22:20 +0000 (16:22 +0200)]
fix datatype mismatches

10 years agofix pack64.phpt related fail on win64
Anatol Belski [Thu, 23 Oct 2014 12:36:55 +0000 (14:36 +0200)]
fix pack64.phpt related fail on win64

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 11:30:24 +0000 (13:30 +0200)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Thu, 23 Oct 2014 10:41:11 +0000 (12:41 +0200)]
fix datatype mismatch

10 years agoexhaust zend_long/size_t potential in levenstein
Anatol Belski [Thu, 23 Oct 2014 10:39:31 +0000 (12:39 +0200)]
exhaust zend_long/size_t potential in levenstein

10 years agoFix some compiler warnings
Bob Weinand [Thu, 23 Oct 2014 11:23:37 +0000 (13:23 +0200)]
Fix some compiler warnings

10 years agoMove phpdbg_print and helper functions to phpdbg_out.*
Bob Weinand [Thu, 23 Oct 2014 11:16:00 +0000 (13:16 +0200)]
Move phpdbg_print and helper functions to phpdbg_out.*

10 years agoDo not use int8_t when it is useless...
Bob Weinand [Thu, 23 Oct 2014 11:02:50 +0000 (13:02 +0200)]
Do not use int8_t when it is useless...

10 years agoFixed "instanceof" with undefined classes
Dmitry Stogov [Thu, 23 Oct 2014 10:50:57 +0000 (14:50 +0400)]
Fixed "instanceof" with undefined classes

10 years agoFixed frame numbering in xml output
Bob Weinand [Thu, 23 Oct 2014 10:38:35 +0000 (12:38 +0200)]
Fixed frame numbering in xml output

10 years agoDo not display dots in xml output for i v/i d
Bob Weinand [Thu, 23 Oct 2014 10:23:48 +0000 (12:23 +0200)]
Do not display dots in xml output for i v/i d

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 09:45:44 +0000 (11:45 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 09:36:34 +0000 (11:36 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 09:05:47 +0000 (11:05 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 08:29:25 +0000 (10:29 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 08:24:16 +0000 (10:24 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 08:18:59 +0000 (10:18 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 07:52:54 +0000 (09:52 +0200)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Thu, 23 Oct 2014 07:45:11 +0000 (09:45 +0200)]
fix datatype mismatch

10 years agofix datatype mismatches
Anatol Belski [Thu, 23 Oct 2014 07:42:46 +0000 (09:42 +0200)]
fix datatype mismatches

10 years agofix datatype mismatch
Anatol Belski [Thu, 23 Oct 2014 07:19:46 +0000 (09:19 +0200)]
fix datatype mismatch

10 years agofix datatype mismatch
Anatol Belski [Thu, 23 Oct 2014 07:17:36 +0000 (09:17 +0200)]
fix datatype mismatch

10 years agomove the more common case up
Anatol Belski [Thu, 23 Oct 2014 07:06:33 +0000 (09:06 +0200)]
move the more common case up

10 years agocatch up with the latest key length change
Anatol Belski [Thu, 23 Oct 2014 06:58:29 +0000 (08:58 +0200)]
catch up with the latest key length change

10 years agomove key lengths to use size_t as zend_string is used internally anyway
Anatol Belski [Thu, 23 Oct 2014 06:52:59 +0000 (08:52 +0200)]
move key lengths to use size_t as zend_string is used internally anyway

10 years agoEmbed FETCH_CLASS <string> into the following NEW
Dmitry Stogov [Thu, 23 Oct 2014 07:52:34 +0000 (11:52 +0400)]
Embed FETCH_CLASS <string> into the following NEW

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
STANLEY SUFFICOOL [Thu, 23 Oct 2014 06:20:26 +0000 (23:20 -0700)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  Implement Bug #66063 - pdo_dblib enable timeout parameter

10 years agoImplement Bug #66062 - pdo_dblib enable timeout parameter
STANLEY SUFFICOOL [Thu, 23 Oct 2014 06:14:23 +0000 (23:14 -0700)]
Implement Bug #66062 - pdo_dblib enable timeout parameter

10 years agoImplement Bug #66063 - pdo_dblib enable timeout parameter
STANLEY SUFFICOOL [Thu, 23 Oct 2014 06:14:23 +0000 (23:14 -0700)]
Implement Bug #66063 - pdo_dblib enable timeout parameter

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Stanley Sufficool [Thu, 23 Oct 2014 03:14:58 +0000 (20:14 -0700)]
Merge branch 'master' of https://git.php.net/push/php-src

10 years agoFixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset()
Stanley Sufficool [Thu, 23 Oct 2014 03:13:22 +0000 (20:13 -0700)]
Fixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset()

10 years agoOptimized HashTable size calculation
Dmitry Stogov [Wed, 22 Oct 2014 20:26:32 +0000 (00:26 +0400)]
Optimized HashTable size calculation

10 years agofix datatype mismatch warning
Anatol Belski [Wed, 22 Oct 2014 18:45:50 +0000 (20:45 +0200)]
fix datatype mismatch warning

10 years agofix datatype mismatches
Anatol Belski [Wed, 22 Oct 2014 18:37:26 +0000 (20:37 +0200)]
fix datatype mismatches

10 years agofix datatype mismatches
Anatol Belski [Wed, 22 Oct 2014 18:21:51 +0000 (20:21 +0200)]
fix datatype mismatches

10 years agofix assert, zero diff would be valid, too
Anatol Belski [Wed, 22 Oct 2014 18:11:43 +0000 (20:11 +0200)]
fix assert, zero diff would be valid, too