clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,278 Commits 494 Branches 1,367 Tags 786 MiB
0b6676ef87
Commit Graph

80278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stanislav Malyshev
f0462db11a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:20:07 -07:00
Stanislav Malyshev
3d9f922c03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:50 -07:00
Stanislav Malyshev
4946dc1ab9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b Added support for parsing ssl certificates using GeneralizedTime format. 
fix bug #65698
fix bug #66636
 2014-06-08 14:17:58 -07:00
krakjoe
0490850957 remove phpdbg directory from source tree on travis 2014-06-08 22:16:06 +01:00
Stanislav Malyshev
f22f665b47 Merge remote-tracking branch 'github/pr/677' 
* github/pr/677:
  Test
  Fix grammar #2683
 2014-06-08 14:02:20 -07:00
Stanislav Malyshev
ee417600bc Merge branch 'pull-request/687' 
* pull-request/687:
  Remove superfluous echos.
 2014-06-08 13:53:40 -07:00
Stanislav Malyshev
fce97414bc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove superfluous echos.
 2014-06-08 13:53:27 -07:00
Stanislav Malyshev
e35945490f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Remove superfluous echos.
 2014-06-08 13:53:01 -07:00
Stanislav Malyshev
da6abc8db4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove superfluous echos.
 2014-06-08 13:50:41 -07:00
Jeff Welch
5fd7c2b01d Remove superfluous echos. 2014-06-08 13:50:22 -07:00
Bob Weinand
4c79fe6afa Updated parser & leer to be usable with re2c 
Fixes some weird temporary compilation errors too
 2014-06-08 20:34:30 +00:00
Jeff Welch
ea543893d0 Remove superfluous echos. 2014-06-08 04:09:14 -04:00
Ferenc Kovacs
2b36a2747d Merge branch 'PHP-5.6' 
* PHP-5.6:
  use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
 2014-06-08 00:18:33 +02:00
Ferenc Kovacs
1e2a4a67dd use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL 2014-06-08 00:01:01 +02:00
Ferenc Kovacs
caf34bf189 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token
 2014-06-07 15:29:29 +02:00
Ferenc Kovacs
016b1f089e Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token 2014-06-07 15:27:54 +02:00