clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,599 Commits 494 Branches 1,367 Tags 802 MiB
2d1a3ecd27
Commit Graph

81599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
George Wang
65810bf259 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:24:19 -05:00
George Wang
f13a88ac13 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:23:36 -05:00
Xinchen Hui
9502d67a8e Merge branch 'PHP-5.5' into PHP-5.6 2015-02-25 20:49:17 +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
d05575afd0 Update NEWs 2015-02-25 18:22:41 +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
caacaee681 Updated NEWS 2015-02-23 11:23:48 +01: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
Julien Pauli
1bfbb546f7 updated NEWS 2015-02-23 11:22:44 +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
Rasmus Lerdorf
7ea5b3f71c NEWS entry 2015-02-22 08:32:32 -08:00
Rasmus Lerdorf
ffd2fda0f3 NEWS entry 2015-02-22 08:31:17 -08:00
Rasmus Lerdorf
a9ba407ce1 Fix bug #68166 
We can't always efree here
php_escape_html_entities can return an interned_empty_string
 2015-02-22 08:25:56 -08:00
Rasmus Lerdorf
e12b72d3f7 Fix bug #68166 
We can't always efree here
php_escape_html_entities can return an interned_empty_string
 2015-02-22 08:14:41 -08:00
Anatol Belski
98959f6220 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2015-02-22 16:47:56 +01:00
Anatol Belski
871d51929b updated NEWS 2015-02-22 16:47:44 +01:00
Anatol Belski
8f6a013c97 updated NEWS 2015-02-22 16:46:39 +01: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
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