clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,653 Commits 494 Branches 1,367 Tags 813 MiB
7032e1b96d
Commit Graph

81653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
dbaef7c038 Avoid unnecessary memory allocation/deallocations and pcre calls 2014-06-09 15:42:32 +04:00
Dmitry Stogov
7bf4fa69be Avoid extra function call on hot path 2014-06-09 15:41:29 +04:00
Bob Weinand
f0a9905759 Merge branch 'PHP-5.6' 2014-06-09 10:07:36 +02:00
Bob Weinand
6adc30028c Merge sapi/phpdbg into PHP-5.6 2014-06-09 10:06:29 +02:00
Bob Weinand
158b03fdef Finish fixing phpdbg on ZTS build 2014-06-09 09:49:21 +02:00
Stanislav Malyshev
857618161f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
 2014-06-08 23:10:52 -07:00
Stanislav Malyshev
b060880c87 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:44 -07:00
Stanislav Malyshev
be133d4eeb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
 2014-06-08 23:10:11 -07:00
Stanislav Malyshev
336b5f59b6 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:04 -07:00
Stanislav Malyshev
954632e9ce Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
 2014-06-08 23:09:37 -07:00
Stanislav Malyshev
4b0b032676 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:09:31 -07:00
Stanislav Malyshev
62857998c5 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:09:09 -07:00
Matteo Beccati
8cfdf20ccf Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191 
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
 2014-06-09 07:08:04 +02:00
Matteo Beccati
106b6faa7a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
 2014-06-09 07:07:28 +02:00
Matteo Beccati
6eaadc0228 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
 2014-06-09 07:07:17 +02:00
Matteo Beccati
af5057bea7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
 2014-06-09 07:07:07 +02:00
Matteo Beccati
5c8c57aa6c Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191 
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
 2014-06-09 07:05:23 +02:00
Stanislav Malyshev
d3eac6399b Merge branch 'PHP-5.6' 
* PHP-5.6:
  update news
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:47:59 -07:00
Stanislav Malyshev
df03bcf135 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:47:38 -07:00
Stanislav Malyshev
706324bf48 update news 2014-06-08 19:47:14 -07:00
Stanislav Malyshev
1b8d4695e2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add news
  Bug 49898 __getCookies() method implementation
 2014-06-08 19:46:12 -07:00
Stanislav Malyshev
9b5d56fd61 add news 2014-06-08 19:44:27 -07:00
Boro Sitnikovski
aebb23e4db Bug 49898 
__getCookies() method implementation
 2014-06-08 19:36:18 -07:00
Stanislav Malyshev
317dec0740 Merge remote-tracking branch 'github/pr/669' 
* github/pr/669:
  Removed another cvsclean file
  Removed cvsclean and svnclean tools
 2014-06-08 19:29:44 -07:00
Stanislav Malyshev
94b4748175 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Removed another cvsclean file
  Removed cvsclean and svnclean tools
 2014-06-08 19:29:26 -07:00
Sobak
00c362c1f6 Removed another cvsclean file 2014-06-08 19:28:06 -07:00
Sobak
244c289f9c Removed cvsclean and svnclean tools 2014-06-08 19:27:58 -07:00
Stanislav Malyshev
c568a8e610 Merge remote-tracking branch 'github/pr/462' 
* github/pr/462:
  Bug 64744 Show the type of the non-object for more descriptive errors
 2014-06-08 19:19:36 -07:00
Stanislav Malyshev
9fceb05fcf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors
 2014-06-08 19:18:09 -07:00
Boro Sitnikovski
cfccdc6362 Bug 64744 
Show the type of the non-object for more descriptive errors
 2014-06-08 19:14:58 -07:00
Stanislav Malyshev
659eeee164 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix order
  fix order
  add news
 2014-06-08 19:05:10 -07:00
Stanislav Malyshev
d2783fbf6c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix order
  fix order
 2014-06-08 19:04:47 -07:00
Stanislav Malyshev
e07083c378 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix order
 2014-06-08 19:04:35 -07:00
Stanislav Malyshev
7ddbfae022 fix order 2014-06-08 19:04:21 -07:00
Stanislav Malyshev
e43270cb2a fix order 2014-06-08 19:03:50 -07:00
Stanislav Malyshev
1607ff8b9e add news 2014-06-08 19:03:31 -07:00
Stanislav Malyshev
a17734fb04 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug 666222
  Fix bug 666222
 2014-06-08 19:02:51 -07:00
Stanislav Malyshev
8f527fbf14 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug 666222
  Fix bug 666222
 2014-06-08 19:02:24 -07:00
Stanislav Malyshev
8f78c3b9eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug 666222
 2014-06-08 19:00:42 -07:00
Levi Morrison
f47976dd9b Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.
 2014-06-08 18:59:44 -07:00
Levi Morrison
e030efa4f6 Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2014-06-08 18:59:23 -07:00
Stanislav Malyshev
7e1e40209a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:54:49 -07:00
Stanislav Malyshev
19edbc9720 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:54:32 -07:00
Stanislav Malyshev
38343856e1 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:53:26 -07:00
Bob Weinand
144077edb8 Fix segfault in tests with lexer 
There's still a bug in parsing commands
 2014-06-09 00:38:06 +02:00
Bob Weinand
7cfe696371 Fix ZTS build 2014-06-09 00:02:10 +02:00
Jefersson Nathan
33926b19d0 Fixed identation on file 2014-06-08 14:30:01 -07:00
Stanislav Malyshev
224f369a03 Merge remote-tracking branch 'github/pr/671' 
* github/pr/671:
  Fix align indentation
  Fixed identation on file
 2014-06-08 14:29:03 -07:00
Jefersson Nathan
e51eaaf665 Fix align indentation 2014-06-08 14:28:51 -07:00
Stanislav Malyshev
6b4835d3e3 Merge branch 'pull-request/676' 
* pull-request/676:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:20:30 -07:00