php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,642 Commits 547 Branches 1,481 Tags
c8e1fae17f215a71ffddf834ef8ca409dfd8e50b
Commit Graph

85642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Andrea Faulds
87c28ccd28 Merge branch 'Closure_apply' 
* Closure_apply:
  Fixed Closure::call() NEWS/UPGRADING
 2014-10-25 17:06:11 +01:00
Andrea Faulds
73a34fed93 Fixed Closure::call() NEWS/UPGRADING 2014-10-25 17:05:52 +01:00
Bob Weinand
be5242e0fe Set engine back to initial state after fatal-ed ev command 2014-10-25 15:29:54 +02:00
Bob Weinand
e995ad1131 Fix eventual stack overflow after clean cmd 2014-10-25 15:28:41 +02:00
Bob Weinand
b79e9044f9 Fix listing of files with no absolute path 2014-10-25 15:06:34 +02:00
Anatol Belski
71a653452f updated libmagic.patch in master 2014-10-25 12:06:17 +02:00
Anatol Belski
470a2e1a8e Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libmagic.patch in 5.6
  updated libmagic.patch in 5.5
 2014-10-25 12:05:34 +02:00
Anatol Belski
3794431b78 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch in 5.5
 2014-10-25 12:04:27 +02:00
Anatol Belski
7e5bd4ec69 updated libmagic.patch in 5.6 2014-10-25 12:03:49 +02:00
Anatol Belski
270df3ffd6 updated libmagic.patch in 5.5 2014-10-25 12:01:58 +02:00
Remi Collet
1fbc93512f Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
 2014-10-25 11:31:54 +02:00
Remi Collet
e75e003ae4 NEWS 2014-10-25 11:30:53 +02:00
Remi Collet
cefa310cf9 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
 2014-10-25 11:30:29 +02:00
Remi Collet
ec3d25fcbd NEWS 2014-10-25 11:29:53 +02:00
Remi Collet
5b295bf191 Fix bug #68283: fileinfo: out-of-bounds read in elf note headers 
Upstream commit
39c7ac1106

CVE -2014-3710

(cherry picked from commit 1803228597)
 2014-10-25 11:29:16 +02:00
STANLEY SUFFICOOL
f35e6a8394 Update PDO_DBLIB README file 2014-10-24 20:30:18 -07:00
STANLEY SUFFICOOL
a1a18fca6e 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.
 2014-10-24 20:10:04 -07:00
STANLEY SUFFICOOL
e33ba844e5 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
  ...
 2014-10-24 20:00:48 -07:00
Anatol Belski
0a5b7d1316 refix the broken place 
typecast from signed to unsigned of a bigger size
 2014-10-25 02:13:44 +02:00
Anatol Belski
010f4b7979 fix infinite loop 2014-10-25 00:32:45 +02:00
Anatol Belski
1b4fd5825a fix datatype mismatch warnings 2014-10-24 20:57:38 +02:00
Anatol Belski
89ed34e3e9 fix datatype mismatches 2014-10-24 20:50:09 +02:00
Anatol Belski
283947af74 fix datatype mismatches 
and convert APIs to size_t where zend_string internally used
 2014-10-24 20:50:08 +02:00
Anatol Belski
f7d3355e75 fix datatype mismatches 
and convert len args to size_t where the underlaying API uses zend_string
 2014-10-24 20:50:06 +02:00
Anatol Belski
35576ea0ac fix datatype mismatch warnings 2014-10-24 20:50:05 +02:00
Anatol Belski
ca46bd04b1 fix datatype mismatch warnings 2014-10-24 20:50:04 +02:00
Anatol Belski
2af99b1866 fix datatype mismatch warnings 2014-10-24 20:50:03 +02:00
Anatol Belski
9ccc3a0c3c fix datatype mismatch warning 2014-10-24 20:50:02 +02:00
Anatol Belski
ff02a1416e fix datatype mismatches 2014-10-24 20:50:01 +02:00
Anatol Belski
4cb58a3936 fix datatype mismatch warnings 2014-10-24 20:50:00 +02:00
Bob Weinand
444b465f3d Re-add phpdbg to travis 2014-10-24 19:32:35 +02:00
Bob Weinand
2bcac53bca Made phpdbg compatible with new engine 2014-10-24 19:29:50 +02:00