php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
79,426 Commits 549 Branches 1,485 Tags
6adc30028cfd04a1c6bcb0866de2fb22dae49ef5
Commit Graph

79426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
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
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 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 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 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
Jefersson Nathan e51eaaf665 Fix align indentation 2014-06-08 14:28:51 -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 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
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 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
Remi Collet bcef1beb8f move NEWS entry in the right place 2014-06-06 17:19:35 +02:00
Nikita Popov 6d1885342c Fix bug #67392: dtrace breaks argument unpack 2014-06-06 17:09:49 +02:00
Remi Collet 50b980f547 NEWS 2014-06-06 14:19:21 +02:00
Remi Collet cc6c7dd8ff Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
 2014-06-06 14:19:05 +02:00
Remi Collet a53b884c47 NEWS 2014-06-06 14:18:29 +02:00
Remi Collet 38e11dfaee Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
 2014-06-06 14:18:17 +02:00
Remi Collet 811f35d0ed NEWS 2014-06-06 14:17:54 +02:00