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
81,570 Commits 549 Branches 1,485 Tags
3cf2b7cc2b26b45699fc998dc57fee103bbf09a2
Commit Graph

81570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski 3cf2b7cc2b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  revisit fix for bug #65272

Conflicts:
	ext/standard/file.c
 2015-02-21 14:14:24 +01:00
Anatol Belski 6751f8b314 revisit fix for bug #65272 2015-02-21 14:10:59 +01:00
Anatol Belski b21d0848c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split test for bug #68557 for windows
 2015-02-20 16:02:07 +01:00
Anatol Belski 3082177bee split test for bug #68557 for windows 2015-02-20 16:01:34 +01:00
Julien Pauli 95be012dce Updated NEWS 2015-02-20 15:44:18 +01:00
Julien Pauli 46e5f0c6bb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-02-20 15:43:53 +01:00
Julien Pauli 6393556a5d Updated NEWS 2015-02-20 15:43:38 +01:00
Julien Pauli 13c3b78f1e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #68557
 2015-02-20 15:38:48 +01:00
Julien Pauli c111d1cd70 fix #68557 2015-02-20 15:09:35 +01:00
Dmitry Stogov 90421b0d5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed type mismatch
 2015-02-20 10:32:34 +03:00
Dmitry Stogov 9fb48edf3c Fixed type mismatch 2015-02-20 10:31:24 +03:00
Ferenc Kovacs 97dd859c9c update NEWS to match the actual stuff in 5.6.6 2015-02-18 20:10:28 +01:00
Ferenc Kovacs d58e76fd69 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS to match the actual stuff in 5.5.22
 2015-02-18 20:09:12 +01:00
Ferenc Kovacs 3d777c8068 update NEWS to match the actual stuff in 5.5.22 2015-02-18 20:08:46 +01:00
Ferenc Kovacs 73a9c701ad update NEWS(add missing entry for the enchant fix, and reorder the entries a bit) 2015-02-18 19:52:00 +01:00
Ferenc Kovacs 3261995092 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo in bug#
  add CVE
  5.4.39 next
 2015-02-18 19:49:23 +01:00
Ferenc Kovacs 24be46323b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in bug#
  add CVE
  5.4.39 next

Conflicts:
	configure.in
	main/php_version.h
 2015-02-18 19:48:50 +01:00
Ferenc Kovacs c17a17e44b fix typo in bug# 2015-02-18 19:47:07 +01:00
Ferenc Kovacs c0a5905522 update NEWS 2015-02-18 19:39:58 +01:00
Ferenc Kovacs 920de2cbe8 fix email format 2015-02-18 19:20:13 +01:00
Ferenc Kovacs 941c1a5fa8 update NEWS 2015-02-18 16:33:32 +01:00
Ferenc Kovacs 4bae11b533 update 5.6.6 release date in NEWS 2015-02-18 16:32:57 +01:00
Ferenc Kovacs 68128efa4b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:32:23 +01:00
Ferenc Kovacs 08b6fe9ef1 Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) 2015-02-18 16:24:09 +01:00
Michael Wallner 6dfc7cbe61 BFN 2015-02-18 14:08:52 +01:00
Michael Wallner ec7ba48e67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-02-18 14:06:39 +01:00
Michael Wallner 83dda66aac fix test 2015-02-18 14:06:32 +01:00
Michael Wallner 23e4af185a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-02-18 14:05:02 +01:00
Michael Wallner 8b6919c77c fix test 2015-02-18 14:04:53 +01:00
Michael Wallner 0d2a2b98c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
 2015-02-18 13:59:32 +01:00
Michael Wallner 225af964c0 Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) 2015-02-18 13:58:31 +01:00
Julien Pauli f977a9f2be Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-02-18 12:41:47 +01:00
Julien Pauli 73c2e9153a Updated NEWS 2015-02-18 12:40:38 +01:00
Remi Collet c6a26cb39d add CVE 2015-02-18 06:44:41 +01:00
Xinchen Hui 97f8c78b09 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-17 21:17:06 +08:00
Xinchen Hui ed1967c706 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2015-02-17 21:16:53 +08:00
Xinchen Hui e22759b1e5 Replace var is introduced 2015-02-17 21:16:37 +08:00
Stanislav Malyshev 0a331f49c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2015-02-17 07:47:27 +01:00
Stanislav Malyshev 213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev 24f8a68d0a 5.4.39 next 2015-02-17 07:34:00 +01:00
Stanislav Malyshev c538a2eb12 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update news
 2015-02-17 06:58:24 +01:00
Stanislav Malyshev 2e8cd42974 update news 2015-02-17 06:58:14 +01:00
Stanislav Malyshev 78389b29f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:57:50 +01:00
Stanislav Malyshev cf7d8eabcc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:53:48 +01:00
Stanislav Malyshev 29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Stanislav Malyshev bdfe457a2c Port for for bug #68552 2015-02-17 06:53:02 +01:00
Stanislav Malyshev 7b18981830 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 
Conflicts:
	ext/date/php_date.c
 2015-02-17 06:43:51 +01:00
Xinchen Hui dec83ea4ac Update NEWS 2015-02-17 11:36:44 +08:00
Xinchen Hui 1c0fa36c61 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-17 11:36:15 +08:00
Xinchen Hui 66d3095993 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) 2015-02-17 11:34:57 +08:00