Commit Graph

85675 Commits

Author SHA1 Message Date
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
c1639b3e52 stdint will be included in the win32 variant, so don't do it twice 2014-10-25 13:01:17 +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
Bob Weinand
c03ac47baf Added some NEWS 2014-10-24 19:26:04 +02:00
Bob Weinand
9b4d9ac6c7 Merge phpdbg into PHP-5.6 2014-10-24 19:22:45 +02:00
Bob Weinand
3639942891 Make xml valid (missing space between attrs) 2014-10-24 14:42:18 +02:00
Bob Weinand
dc61a5c359 Fix info classes file name in xml 2014-10-24 14:29:06 +02:00
Bob Weinand
87c055e95e Add note about <eval> tag for errors in xml.md 2014-10-24 14:18:02 +02:00
Bob Weinand
9053b8a4d4 Name the tag <eval> if the error id during ev cmd 2014-10-24 14:16:49 +02:00
Bob Weinand
b0089e3c2f Do not print out xml as PHP print... 2014-10-24 13:11:14 +02:00
Bob Weinand
9ce03bc7da Fix output to wrong function 2014-10-24 12:55:44 +02:00
Bob Weinand
56b3eda377 Fixed parameter order on %.*s 2014-10-24 12:32:48 +02:00
Bob Weinand
23a408a51b Too much copypaste... 2014-10-23 20:14:12 +02:00
Bob Weinand
f025482678 Add xml formatted deep dump of return value from ev 2014-10-23 17:19:26 +02:00
Anatol Belski
53560ca06b rework the previous fix for var names with size_t, no ugly casts anymore 2014-10-23 16:50:35 +02:00
Anatol Belski
74997dcf7e add include for usleep() proto 2014-10-23 16:49:47 +02:00
Anatol Belski
4fa92438f4 fix datatype mismatches 2014-10-23 16:38:25 +02:00
Anatol Belski
5b9f3a24d6 fix datatype mismatch 2014-10-23 16:31:19 +02:00
Anatol Belski
99e236e3cc fix datatype mismatches 2014-10-23 16:29:02 +02:00
Anatol Belski
744c19eed8 fix datatype mismatches 2014-10-23 16:22:20 +02:00