clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,601 Commits 494 Branches 1,367 Tags 801 MiB
cfaf7c3b5f
Commit Graph

34768 Commits

Author SHA1 Message Date
Xinchen Hui
cfaf7c3b5f Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:42:57 +08:00
Xinchen Hui
3e82816ba1 Fixed bug #69125 (Array numeric string as key) 2015-02-27 11:42:36 +08:00
Xinchen Hui
2d1a3ecd27 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa fix bug#68942's patch 
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
 2015-02-27 10:41:53 +08:00
Xinchen Hui
34d397e267 better name 2015-02-25 20:49:07 +08:00
Xinchen Hui
d3615b5fb1 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/opcache/tests/bug69038.phpt
 2015-02-25 20:13:47 +08:00
Xinchen Hui
d508ff9640 Improve fix for #69038 2015-02-25 20:07:02 +08:00
Xinchen Hui
9641bac0f5 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-25 18:22:18 +08:00
Xinchen Hui
ffdc5728c8 Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage) 2015-02-25 18:21:59 +08:00
Julien Pauli
5256ffd4fe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  curl: add new proxy constants
 2015-02-23 11:23:00 +01:00
Linus Unnebäck
63ab6d8249 curl: add new proxy constants 2015-02-23 11:19:36 +01:00
Julien Pauli
ee2f749a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test fails for bug68557
 2015-02-23 10:35:35 +01:00
Xinchen Hui
d5a1a3342b Fixed test fails for bug68557 2015-02-23 10:35:16 +01:00
Jakub Zelenka
97d809a8a5 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/json/json.c
 2015-02-22 20:35:03 +00:00
Jakub Zelenka
591dbcabe5 Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e) 2015-02-22 20:22:47 +00:00
Anatol Belski
e656932d0e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix Win32 SSPI initialization for digest authentication in cURL
 2015-02-22 16:26:52 +01:00
Anatol Belski
68afd75ecd Merge branch 'pull-request/1112' into PHP-5.5 2015-02-22 16:26:02 +01:00
Grant Pannell
7988f703f8 Fix Win32 SSPI initialization for digest authentication in cURL 2015-02-22 23:34:55 +10:30
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
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
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
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
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
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
Felipe Pena
94742054a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 01:08:07 -02:00
Felipe Pena
0c01fca444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:28 -02:00
Felipe Pena
a331ae4630 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:11 -02:00
Felipe Pena
8f9ab04d93 - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) 2015-02-17 00:23:47 -02:00
Felipe Pena
abbc82f448 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fix merge
  BFN
 2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Xinchen Hui
edd16831b1 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040 Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00