mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
49,700 Commits 500 Branches 1,381 Tags 797 MiB
f1e2edff8b
Commit Graph

5508 Commits

Author SHA1 Message Date
Johannes Schlüter
6b2b195267 This wil be PHP 5.3.16 2012-07-05 01:15:27 +02:00
Stanislav Malyshev
5f31c81f07 remove duplicates, fix order 2012-06-30 17:36:22 -07:00
Anthony Ferrara
7e8276ca68 Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt) 
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
 2012-06-28 20:00:03 -04:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
Nikita Popov
4662151ea7 Improve JSON error handling 
json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.

As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.
 2012-06-27 12:21:48 +02:00
Moriyoshi Koizumi
ce2082d24f BFN 2012-06-25 19:20:38 +09:00
Felipe Pena
cc90ac54be - BFN 2012-06-23 15:21:20 -03:00
Nikita Popov
5d81fe6f12 Add NEWS for bug #62262 2012-06-19 18:40:46 +02:00
Johannes Schlüter
26cb570615 Merge PHP 5.3.14 NEWS 2012-06-13 10:35:58 +02:00
Stanislav Malyshev
f0d6059389 re-add 61755 to NEWS 2012-06-12 11:52:22 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Anatoliy Belsky
9ecb67d5a4 updated NEWS 2012-06-07 21:43:07 +02:00
Felipe Pena
7cae4ff02c - BFN 2012-06-07 14:23:17 -03:00
Pierrick Charron
fed5923dbc Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon) 
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
 2012-06-07 17:44:20 +02:00
Jerome Loyet
38ca8cb7a1 - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:18:48 +02:00
Xinchen Hui
1f5327a602 Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) 2012-06-01 14:57:27 +08:00
Stanislav Malyshev
aab49e934d fix CVE-2012-2143 2012-05-29 23:07:04 -07:00
Jerome Loyet
e7ff3e839b Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) 2012-05-26 19:27:02 +02:00
Jerome Loyet
f6655b62d8 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:22:12 +02:00
Jerome Loyet
a7761262f7 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:21:44 +02:00
Jerome Loyet
bf9120ecae - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:10:17 +02:00
Johannes Schlüter
8fc9df3f67 Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy 2012-05-25 00:22:25 +02:00
Johannes Schlüter
cfea8e5d04 Those changes are in 5.3.15 2012-05-25 00:20:29 +02:00
Felipe Pena
abe0f17e88 - BFN 2012-05-24 13:45:03 -03:00
Gustavo André dos Santos Lopes
f1969d4b4c Update NEWS 2012-05-24 11:14:36 +02:00
Gustavo André dos Santos Lopes
e08566c613 Fixed bug #62017 
IntlDateFormatter constructor would release some resources
under certain error conditions.
 2012-05-23 15:52:19 +02:00
Gustavo André dos Santos Lopes
c449bf1443 Fixed bug number in NEWS 2012-05-23 13:42:24 +02:00
Gustavo André dos Santos Lopes
1c19146f46 Updated NEWS w.r.t to ext/intl changes 2012-05-23 13:35:11 +02:00
Jerome Loyet
5d61e56dd7 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:52:04 +02:00
Jerome Loyet
812d248193 - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:30:27 +02:00
Jerome Loyet
7b396c078c - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 09:49:13 +02:00
Jerome Loyet
faca4e08b4 - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:34:27 +02:00
Felipe Pena
79d52503a4 - BFN 2012-05-18 19:38:02 -03:00
Johannes Schlüter
72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Stanislav Malyshev
6e51989501 fd fix 2012-05-16 16:35:16 +02:00
Xinchen Hui
3332943c9d Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) 2012-05-12 13:13:44 +08:00
Anatoliy Belsky
652632a89b updated NEWS 2012-05-10 15:48:56 +02:00
Anatoliy Belsky
838b4b8ff7 updated NEWS 2012-05-08 18:51:49 +02:00
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Xinchen Hui
7ccd594392 Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference) 2012-05-06 20:01:10 +08:00
Nikita Popov
304ac568c5 Add NEWS entry for bug #61961 2012-05-06 13:19:17 +02:00
Xinchen Hui
4632fe0eef correct NEWS 2012-05-06 00:51:20 +08:00
Xinchen Hui
035ce937e1 Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:40:49 +08:00
Xinchen Hui
bae56a87f8 Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). 2012-04-30 12:09:22 +08:00
Felipe Pena
9aff3a1156 - BFN 2012-04-29 19:44:27 -03:00
Gustavo André dos Santos Lopes
8d748e5de5 Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64 
Also fixed possible invalid read on big endian LP64.
 2012-04-23 22:09:38 +01:00
Xinchen Hui
c06e92a533 Fixed bug #61812 (Uninitialised value used in libmagic) 2012-04-22 19:38:14 +08:00
Felipe Pena
dd34fe52b9 - BFN 2012-04-19 23:23:46 -03:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Johannes Schlüter
1461a40301 Remove cherry-picked items for 5.3.11 2012-04-12 11:21:41 +02:00
Adam Harvey
3f3ad30c50 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and 
remove a test case that's now mooted by this fix.
 2012-04-11 08:24:38 +08:00
Xinchen Hui
9bf8cd4b34 Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) 2012-04-06 21:42:40 +08:00
Anatoliy Belsky
db834fc460 updated the NEWS with the latest fileinfo changes 2012-04-04 12:36:34 +02:00
Xinchen Hui
94f1c05ff8 Fixed bug #61617 (Libxml tests failed(ht is already destroyed)) 2012-04-04 17:22:37 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Xinchen Hui
6d97e28e42 Update NEWS for #61541 2012-04-03 12:13:59 +08:00
Moriyoshi Koizumi
a6c95c8a00 Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc. 
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
 2012-04-03 01:51:23 +09:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
Johannes Schlüter
21fa9634c1 Merge remote branch 'security/PHP-5.3' into PHP-5.3 
* security/PHP-5.3:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-29 10:54:08 +02:00
Stanislav Malyshev
167e2fd782 fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN 2012-03-25 12:50:25 -07:00
Stanislav Malyshev
4c478f9ca6 NEWS for bug #61487 2012-03-25 00:57:08 -07:00
Ilia Alshanetsky
8d0760f38a Revert incorrect fix 2012-03-24 12:27:55 -04:00
Xinchen Hui
9c99a89e8e Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)" 
This reverts commit fcae164ea6.
 2012-03-24 19:26:02 +08:00
Xinchen Hui
fcae164ea6 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 15:13:10 +08:00
Gustavo André dos Santos Lopes
15d7d460bd Updated NEWS (DOM object debug info handler). 2012-03-23 22:13:26 +00:00
Gustavo André dos Santos Lopes
e8ecb11449 Revert "revert from NEWS too" 
This reverts commit 4990250f2d.
 2012-03-23 09:40:20 +00:00
Stanislav Malyshev
4990250f2d revert from NEWS too 2012-03-22 22:34:32 -07:00
Johannes Schlüter
1a0b0ead14 Fix NEWS 2012-03-22 16:40:13 +01:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
Rasmus Lerdorf
24a57ae9a5 NEWS entry for readline fix 2012-03-21 09:15:35 -07:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04:00
Pierre Joye
fda25d97ff - update NEWS 2012-03-21 07:06:07 +01:00
Ilia Alshanetsky
edb57810a7 Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). 2012-03-19 13:10:23 -04:00
Gustavo André dos Santos Lopes
227112cb0f - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads 
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
 2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or 
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
 2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Ilia Alshanetsky
1ef5fa8710 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
601d17d1ae Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
2cc64c28f0 Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Xinchen Hui
7536bf963d Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
41fa157c44 Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
e2efb68056 Sorry for wrong order again. 2012-03-11 09:06:12 +00:00
Xinchen Hui
fc3e63e412 Re-order them according to README.SVN-RULES 2012-03-11 09:02:00 +00:00
Xinchen Hui
eff668a596 Oops, sorry for my poor english 2012-03-11 08:34:06 +00:00
Xinchen Hui
a7639291b4 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650 - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Ilia Alshanetsky
b61f335b9d Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). 2012-03-08 20:14:26 +00:00
Gustavo André dos Santos Lopes
f413b3726c - Fixed bug #61253: Wrappers opened with errors concurrency problem 
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
 2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
b7c9f8ae8a - Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed 
rows on postgresql >= 9
 2012-03-08 08:52:28 +00:00
Ilia Alshanetsky
f005f36cd6 Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()) 2012-03-08 03:31:46 +00:00
Johannes Schlüter
512fdb4cc2 Fix bug #61003 mysql_stat() require a valid connection 2012-03-06 00:15:40 +00:00
Johannes Schlüter
dc0070e323 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Dmitry Stogov
a05a3a0a4a Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header) 2012-03-05 12:59:01 +00:00
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
3e7792aed7 Fix bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable 2012-03-03 12:46:17 +00:00
Nikita Popov
37d7df72a6 Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Adam Harvey
03f3d03ce0 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
b6427b8f5d Add the CVE numbers that were mentioned in the related php.net announcements 2012-02-29 20:48:17 +00:00
Christopher Jones
c82d0a1e0b Remove "backported" from 5.4 comments since 5.3 is the base version these bugs are fixed. Reorder. 2012-02-29 18:46:17 +00:00
Xinchen Hui
c870ebe138 Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-02-25 14:15:11 +00:00
Nikita Popov
f79e133360 NEWS for r323330 
So cjones doesn't have nightmares :P
 2012-02-25 13:04:43 +00:00
Xinchen Hui
1ee93c83ff Fixed bug #61165 (Segfault - strip_tags()) 2012-02-25 04:36:08 +00:00
Gustavo André dos Santos Lopes
48666d9ffc - Fixed bug #61173 (Unable to detect error from finfo constructor). 
- Tidied up NEWS
 2012-02-24 10:01:39 +00:00
Christopher Jones
31a100dccd Relocate orphan line 2012-02-23 19:43:38 +00:00
Nikita Popov
48a01d2b00 NEWS for r323362 2012-02-22 17:21:57 +00:00
Gustavo André dos Santos Lopes
eb1ada852d - Fixed bug #61115 (stream related segfault on fatal error in 
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
 2012-02-22 11:45:26 +00:00
Etienne Kneuss
86fcb9659e Fix #61095 (Lexing 0x0*+<NUM> incorrectly) 2012-02-20 18:28:57 +00:00
Nikita Popov
bfcc199f28 Fix bug #61097 Memory leak in xmlrpc functions copying zvals 
Needs to be merged to 5.4.
 2012-02-18 14:58:19 +00:00
Adam Harvey
1551f20129 Merge 5.3.10 NEWS, per Ondřej's mailing list prod. 2012-02-18 04:32:45 +00:00
Dmitry Stogov
282d3f2034 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Xinchen Hui
8f7381a6ea Fixed bug #61072 (Memory leak when restoring an exception handler) 2012-02-14 05:35:34 +00:00
Xinchen Hui
c578917e30 Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-02-12 04:59:08 +00:00
Xinchen Hui
2e61d04f49 decrescent order 
#<Felipe> laruence: yes, we used to use decrescent order of bug id in the NEWS entry.
 2012-02-08 15:07:28 +00:00
Xinchen Hui
3f23b11151 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Antony Dovgal
ce1a1f5f49 fix bug #54682 (tidy null pointer dereference) 2012-02-07 20:49:10 +00:00
Xinchen Hui
30f63e4152 Fixed bug #60968 (Late static binding doesn't work with ReflectionMethod::invokeArgs()) 2012-02-03 16:27:35 +00:00
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +00:00
Johannes Schlüter
1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Dmitry Stogov
43a0ee73a1 Fixed basic HTTP authentication for WSDL sub requests 2012-02-01 11:26:57 +00:00
Dmitry Stogov
ce9f1a4313 Fixed bug #51860 (Include fails with toplevel symlink to /) 2012-01-30 10:08:11 +00:00
Rasmus Lerdorf
c5bb1710bd createCollation 2012-01-29 04:23:27 +00:00
Rasmus Lerdorf
996d91b6b9 createCollation() 2012-01-29 03:59:35 +00:00
Felipe Pena
f78c9a9f4e - Fixed bug #60860 (session.save_handler=user without defined function core dumps) 2012-01-28 21:02:09 +00:00
Pierre Joye
4879a01b54 - fix #60895, possible invalid handler usage 2012-01-27 10:56:33 +00:00
Xinchen Hui
6b1d3b3d10 Re-fixed bug #60825 (Segfault when running symfony 2 tests) 2012-01-24 14:39:45 +00:00
Gustavo André dos Santos Lopes
45a6f8d9a5 - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected 
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
#withheld commit to 5.4
 2012-01-22 20:30:37 +00:00
Rasmus Lerdorf
dd95d90509 . 2012-01-19 22:41:39 +00:00
Popa Adrian Marius
d13feb83ed Added the bugfixing notes to the NEWS file 2012-01-19 22:35:35 +00:00
Rui Hirokawa
61088ce729 MFH: fixed bug #60227: header() cannot detect the multi-line header with CR. 2012-01-14 07:41:01 +00:00
Johannes Schlüter
3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00
Popa Adrian Marius
24e071c021 added fixed Pdo Firebird bugs to the NEWS section 2012-01-10 06:53:37 +00:00
Jérôme Loyet
ae7943a79d - Fixed credits for bug #60659 2012-01-04 21:19:55 +00:00
Jérôme Loyet
b9fab77d13 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
0ca9fbc0de - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Popa Adrian Marius
5e9cf83df7 Forgot to add the Pdo Firebird related bug to the News 2011-12-27 11:05:58 +00:00
Johannes Schlüter
af07705f97 Back to -dev 2011-12-22 12:36:40 +00:00
Johannes Schlüter
712be66d05 PHP 5.3.9RC4 2011-12-22 12:33:04 +00:00
Scott MacVicar
095cbc48a8 Fix segfault in older versions of OpenSSL (before 0.9.8i) 2011-12-18 05:14:32 +00:00
Dmitry Stogov
0d1998e34f Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 08:47:03 +00:00
Gustavo André dos Santos Lopes
74d2b2f0bd - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together 
with the last read.
 2011-12-11 21:08:15 +00:00
Johannes Schlüter
451263f7d0 - Back to -dev 2011-12-08 13:46:45 +00:00
Johannes Schlüter
4307bd57db - 5.3.9RC3 2011-12-08 11:01:37 +00:00
Johannes Schlüter
52169a44af - These changes were done after RC2. 2011-12-08 11:00:16 +00:00
Derick Rethans
9aaec1c6e0 - Fixed bug number. 2011-12-06 06:23:13 +00:00
Derick Rethans
5b2ce47f2e - Fixed bug #53502 (strtotime with timezone memory leak). 
- Fixed bug #52062 (large timestamps with DateTime::getTimestamp and
  DateTime::setTimestamp).
- Fixed bug #51994 (date_parse_from_format is parsing invalid date using 'yz'
  format).
- Fixed bug #51223 (Seg fault while creating (by unserialization)
  DatePeriod).
 2011-12-06 06:21:08 +00:00
Ilia Alshanetsky
8222ae737c Fixed Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized 
domain name addresses containing >1 -).
 2011-12-04 14:52:40 +00:00