Commit Graph

433 Commits

Author SHA1 Message Date
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Michael Gorovoy 9c862f2699 HttpExchangeTest#testOptionsWithExchange no longer fails on Mac OS X 2011-08-30 16:47:19 -04:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 3280e9401a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-08-30 12:52:15 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07:00
Michael Gorovoy aefd353752 Adjusted TimeoutExchangeTest timeouts 2011-08-30 15:35:13 -04:00
Greg Wilkins 45148353ec 293739 Hide stacks in named log testing. Various other minor log cleanups in output. 2011-08-30 16:05:21 +10:00
Greg Wilkins 33fa7afb47 356144 added SelectorManager.setSelectorPriorityDelta(int) 2011-08-30 14:24:28 +10:00
Michael Gorovoy 0763e040e5 353014 TimeoutExchangeTest run time reduced
Patch provided by Thomas Becker <tbecker@intalio.com>
2011-08-29 16:18:45 -04:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Michael Gorovoy 103d7a87c2 353623 Added new methods to HttpExchange 2011-08-26 03:49:58 -04:00
Joakim Erdfelt 4ace183764 Merging from master 2011-08-25 12:09:36 -07:00
Joakim Erdfelt 3399242d83 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -07:00
Michael Gorovoy 5aced83287 Added tests for missing CONTINUE 100, error response, and timeout 2011-08-23 16:56:05 -04:00
Greg Wilkins da517c815a JETTY-1410 handle 1xx in similar fashion to 401s and 302s 2011-08-23 17:07:31 +10:00
Michael Gorovoy 07b8f08a37 JETTY-1410 HTTP client handles CONTINUE 100 response correctly 2011-08-23 16:20:37 +10:00
Michael Gorovoy d8d5414f64 Added unit test for unexpected data being received by the client 2011-08-19 13:11:57 -04:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Greg Wilkins 6b9ecd0806 353073 Improved client API to use futures 2011-08-11 11:50:23 +10:00
Thomas Becker 0a6c7ad846 353563: HttpDestinationQueueTest too slow
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-08-02 08:39:38 -05:00
Jesse McConnell cd0dd3e8ff [Bug 352999] test performance patch applied to jetty-client, thanks Thomas 2011-08-02 08:04:18 -05:00
Greg Wilkins 2806869cfd 353073 test harness for websocket client and improved ietf draft 10 compliance 2011-08-01 12:35:01 +10:00
Greg Wilkins 2be177484e Miscellaneous changes resulting from the optimization for 7.5.x
Mostly refining debug and toString()
Use shutdown for idle expiry
2011-07-22 18:12:56 +10:00
Greg Wilkins f4255bdeef Merge branch 'master' into performance 2011-07-18 09:16:51 +10:00
Greg Wilkins 70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Michael Gorovoy dc3445cea2 298502 CONNECT uses same HTTP version as original request 2011-07-15 09:32:55 -04:00
Greg Wilkins 61b2a5c751 298502 Handle 200 Connect responses with no content-length 2011-07-15 15:50:41 +10:00
Greg Wilkins b62c5cdde6 298502 added ProxyFakeTunnelTest.java to demonstrate the issue 2011-07-15 15:06:26 +10:00
Greg Wilkins a26ddd5933 created performance version 2011-07-14 15:38:25 +10:00
Greg Wilkins d8cb8556aa return client buffers 2011-07-14 11:58:14 +10:00
Greg Wilkins 1093a95566 Merge branch 'master' into performance 2011-07-08 11:59:24 +10:00
Jesse McConnell 39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell 5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05:00
Greg Wilkins b890ff8fb2 applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser. 2011-07-07 12:16:58 +10:00
Michael Gorovoy b5a2e7e426 308851 Converted all jetty-client module tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3459 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-02 00:57:56 +00:00
Michael Gorovoy c8375b286a 308851 Converted all jetty-client tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3457 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 21:06:31 +00:00
Jesse McConnell 6190961f31 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
Jesse McConnell db9f79eaff [maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell b9fffcb9a0 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
Jesse McConnell ea23a83bb3 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +00:00
Jesse McConnell b1ca45e709 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
Jesse McConnell 5f5cb8ea53 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +00:00
Michael Gorovoy c17b91fa86 JETTY-1385 NPE in jetty client's HTttpExchange.setRequestContentSource(InputStream)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3438 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 19:01:17 +00:00
Michael Gorovoy 0b9f348132 308851 Convert HttpExchangeTest and related tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3433 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:17:13 +00:00
Michael Gorovoy b290f203da Added TODO comments for disabled tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3429 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-27 15:13:22 +00:00
Michael Gorovoy 77b02e0ee0 350283 Excluded AsyncSslHttpExchangeTest.testPerf() from test runs on MacOS X unless stress is enabled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3423 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-24 15:46:30 +00:00
Jesse McConnell 54e885d967 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:20:58 +00:00
Jesse McConnell e35f16bae5 [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:14:37 +00:00
Jesse McConnell 64cbf74b09 reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 11:59:36 +00:00
Greg Wilkins 92c1a7bc5d [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 08:51:01 +00:00
Joakim Erdfelt d77ac8acb4 Using new jetty-test-helper 1.5-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3265 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 23:05:29 +00:00
Simone Bordet 922fb70344 Fixes #347137 (Allow SSL renegotiations by default in HttpClient).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3255 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 11:47:26 +00:00
Greg Wilkins b2f5416fcd made HttpClient dumpable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3236 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 01:21:52 +00:00
Simone Bordet e438787325 Reviewed and cleaned up code for #345615 (Enable SSL Session caching).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3223 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:46:57 +00:00
Jesse McConnell 51f6df9871 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:57:00 +00:00
Jesse McConnell 28e63af76b [maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
Jesse McConnell 0793141d2c [maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
Jesse McConnell be9da35ef4 set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
Jesse McConnell 898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +00:00
Michael Gorovoy e5f549664e 345615 SSL Session caching improvements and test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3157 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 22:54:53 +00:00
Michael Gorovoy ab85bcda4f 345615 Enable SSL Session caching
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3145 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-14 01:30:26 +00:00
Greg Wilkins f8dc394adb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
Greg Wilkins 6e0649ab3f [maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
Jesse McConnell 314a59192d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
Jesse McConnell fadbd0bdc5 [maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins 5d0f1b88f4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins 83b6c19cca [maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Simone Bordet 3d192f98ab Fixes #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3069 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 08:57:26 +00:00
Simone Bordet f8cb795a4f Setting non-blocking mode after connecting in blocking mode.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3049 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 15:00:00 +00:00
Simone Bordet 26751210e4 Changes in preparation for #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3044 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-29 13:47:09 +00:00
Simone Bordet 057eb0a102 Fixes #343567 (HttpClient does not limit the destination's exchange queue).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3028 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-21 15:29:20 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 58652d8f09 342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins dad96688b3 less verbose logging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2989 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 00:50:13 +00:00
Michael Gorovoy fa6ef11ad6 Set the version of jetty-test-policy artifact to 1.2
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2968 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 20:37:19 +00:00
Simone Bordet 8df474ea97 Fixes #341171 (Locking in HttpDestination blocks all requests to the same address).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2963 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 14:30:11 +00:00
Greg Wilkins 50541649ca Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Greg Wilkins 1bd0adabfb 340949 Scanner delays file notifications until files are stable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2948 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 02:18:18 +00:00
Simone Bordet f3a66396b1 Made the test more reliable under Windows.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2943 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 14:40:50 +00:00
Greg Wilkins 8d5b3c5261 341439 Blocking HttpClient does not use soTimeout for timeouts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2940 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 00:30:22 +00:00
Simone Bordet cf09f69e53 Fixed #341386 (Remote close not detected by HttpClient).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2938 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 15:50:13 +00:00
Jesse McConnell 6d4ec6a4bc initialize booleans in test exchange
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2937 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 15:36:25 +00:00
Greg Wilkins f814c815d2 improved tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2930 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 06:06:23 +00:00
Simone Bordet 05c3f0338d Improved handling of connection close, in case a request gets no response because the connection has been closed.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2921 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-29 15:15:00 +00:00
Greg Wilkins fdf199e254 organized imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2912 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 05:59:18 +00:00
Michael Gorovoy be843880b7 340878 Integrations should be able to load their own keystores
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2910 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-24 17:22:40 +00:00