clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,941 Commits 491 Branches 1,363 Tags 846 MiB
a41a16c5cd
Commit Graph

80941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tjerk Meesters
a41a16c5cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Moved streams related functions to xp_ssl.c
 2014-07-31 12:18:19 +08:00
Tjerk Meesters
8f345a7148 Moved streams related functions to xp_ssl.c 2014-07-31 12:17:17 +08:00
Keyur Govande
33ce329f57 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
 2014-07-30 18:50:07 +00:00
Keyur Govande
4383ac04a0 Remove duplicate NEWS 2014-07-30 18:48:43 +00:00
Keyur Govande
33c4b9d5a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Update NEWS
 2014-07-30 18:41:13 +00:00
Keyur Govande
b96224625c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-07-30 18:39:59 +00:00
Keyur Govande
7b60430a8f Update NEWS 2014-07-30 18:39:23 +00:00
Keyur Govande
752c40d2ec Update NEWS 2014-07-30 18:38:48 +00:00
Keyur Govande
0a29e4731e Update NEWS 2014-07-30 18:33:19 +00:00
Michael Wallner
03f56152e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:14:40 +02:00
Michael Wallner
b3b25e1b70 BFN 2014-07-30 20:14:03 +02:00
Michael Wallner
ceadf783fe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:13:39 +02:00
Michael Wallner
48cadf242d BFN 2014-07-30 20:13:17 +02:00
Michael Wallner
6ed9991a6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:12:50 +02:00
Michael Wallner
12b2127b72 Fixed bug #67715 (php-milter does not build and crashes randomly). 2014-07-30 20:12:13 +02:00
Rasmus Lerdorf
e7d921fd0b Merge commit '8b9719d' 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:46 -04:00
Rasmus Lerdorf
7fe21ce0f3 Merge commit '8b9719d' into PHP-5.6 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:36 -04:00
Rasmus Lerdorf
579c9066a0 Merge commit '8b9719d' into PHP-5.5 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:24 -04:00
Rasmus Lerdorf
8b9719d8b9 We need to turn off any strict mode here for this warning to show up 2014-07-30 12:22:48 -04:00
Bob Weinand
3c0adf2dcd Merge branch 'PHP-5.6' 2014-07-30 18:07:01 +02:00
Bob Weinand
d5ddd2dbb2 Disable restrictions regarding arrays in constants at run-time. 
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
 2014-07-30 17:57:07 +02:00
Bob Weinand
354ee12b73 Revert "Fix bug #67064 in a BC safe way" 
This reverts commit 1a4a9eede5.

Conflicts:
	ext/standard/array.c
	ext/standard/tests/array/bug67064.phpt
 2014-07-30 17:18:05 +02:00
Tjerk Meesters
0dc88c45b8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
 2014-07-30 18:28:23 +08:00
Tjerk Meesters
f925892920 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
 2014-07-30 18:27:29 +08:00
Tjerk Meesters
52f4587e8a Updated NEWS for #67693 2014-07-30 18:17:36 +08:00
Tjerk Meesters
e9967292c3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
 2014-07-30 18:17:13 +08:00
Tjerk Meesters
b3466f862f Updated NEWS for #67693 2014-07-30 18:16:56 +08:00
Tjerk Meesters
da3add26cf Fixed bug #67693 - incorrect push to the empty array 2014-07-30 18:15:14 +08:00
Ferenc Kovacs
ff5a934f21 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing entry to NEWS
 2014-07-30 11:47:29 +02:00
Ferenc Kovacs
8e13e50267 add missing entry to NEWS 2014-07-30 11:47:14 +02:00
Ferenc Kovacs
83c8cd591c Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing entries to NEWS
 2014-07-30 11:27:13 +02:00
Ferenc Kovacs
d325a1c523 add missing entries to NEWS 2014-07-30 11:26:55 +02:00
Ferenc Kovacs
3c8cee0171 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS block for the next RC
 2014-07-30 10:51:44 +02:00
Ferenc Kovacs
858c076810 add NEWS block for the next RC 2014-07-30 10:51:28 +02:00
Ferenc Kovacs
f893b18544 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS entry for #67713
  update the exception message to better match the actual check
  ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
 2014-07-30 10:46:31 +02:00
Ferenc Kovacs
d649b785d6 NEWS entry for #67713 2014-07-30 10:45:35 +02:00
Ferenc Kovacs
89b54c2aa5 Merge branch 'newInstanceWithoutConstructor' into PHP-5.6 
* newInstanceWithoutConstructor:
  update the exception message to better match the actual check
  ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
 2014-07-30 10:23:29 +02:00
Ferenc Kovacs
d18b16244c update the exception message to better match the actual check 2014-07-30 10:16:01 +02:00
Ferenc Kovacs
d586441d90 ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct() 2014-07-30 10:08:56 +02:00
Dmitry Stogov
8ad3445713 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed usage after free
 2014-07-30 10:40:32 +04:00
Dmitry Stogov
43e956a9a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed usage after free
 2014-07-30 10:40:06 +04:00
Dmitry Stogov
aa3ddda8e5 Fixed usage after free 2014-07-30 10:39:25 +04:00
Keyur Govande
0e04d542e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:47:44 +00:00
Keyur Govande
f0278589e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:41:01 +00:00
Keyur Govande
ab4c4c3970 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
 2014-07-30 02:34:46 +00:00
Keyur Govande
ab6c1d21f9 Undo inadvertent commit of php_version 2014-07-30 02:34:21 +00:00
Keyur Govande
65364fe7d0 Corrected patch for bug #60616 
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
 2014-07-30 02:28:31 +00:00
Tjerk Meesters
0120a9ca4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Wildcards should only be used in the first name component; fixed comment style
 2014-07-29 19:15:20 +08:00
Tjerk Meesters
a7dad26c4b Wildcards should only be used in the first name component; fixed comment style 2014-07-29 19:15:01 +08:00
Keyur Govande
e7df0af6bd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
 2014-07-28 23:17:23 +00:00