php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,282 Commits 549 Branches 1,487 Tags
ac6c86b7dcfcbcb21b45da32ecffcaf28f50fa39
Commit Graph

34407 Commits

Author SHA1 Message Date
Stanislav Malyshev ac6c86b7dc fix test 2014-06-10 14:25:49 -07:00
Remi Collet 0b6676ef87 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:36:38 +02:00
Remi Collet 0a7e131128 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:36:02 +02:00
Remi Collet 12a62ce868 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:35:23 +02:00
Remi Collet 25b1dc917a Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec 
Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d

Adapted for C standard.
 2014-06-10 14:33:37 +02:00
Remi Collet ed28d84b9a Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:24:28 +02:00
Remi Collet 9ee147e6ff Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:24:07 +02:00
Remi Collet ff66c90af0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:23:37 +02:00
Remi Collet 40ef6e07e0 Bug #67412 fileinfo: cdf_count_chain insufficient boundary check 
Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
 2014-06-10 14:22:04 +02:00
Remi Collet 59383273eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:17:06 +02:00
Remi Collet 1d6286c049 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:16:39 +02:00
Remi Collet f6fee381be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:16:07 +02:00
Remi Collet 5c9f967999 Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check 
Upstream:
https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67
 2014-06-10 14:13:14 +02:00
Remi Collet 8cd184f14a Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:05:44 +02:00
Remi Collet 5e7cb43890 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:05:02 +02:00
Remi Collet 18ff81eb1a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:04:36 +02:00
Remi Collet e77659a8c8 Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size 
Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
 2014-06-10 14:02:36 +02: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 336b5f59b6 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:04 -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 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 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
Boro Sitnikovski aebb23e4db Bug 49898 
__getCookies() method implementation
 2014-06-08 19:36:18 -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
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 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
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 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
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
Remi Collet b16950b5d3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test for 5.4/5.5
 2014-06-05 17:34:32 +02:00
Remi Collet 67f1a58ac9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test for 5.4/5.5
 2014-06-05 17:34:09 +02:00
Remi Collet 127651e9ae fix test for 5.4/5.5 2014-06-05 17:33:40 +02:00
Remi Collet f11f7f5601 restore correct behavior of DateTime 2014-06-05 14:04:44 +02:00