Oleg Kalnichevski
898b33ac21
HTTPCLIENT-1216: Added method to force clean thread-local used by DateUtils
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1364276 13f79535-47bb-0310-9956-ffa450edef68
2012-07-22 12:20:27 +00:00
Oleg Kalnichevski
ba18ddbaca
Make custom query component and form parameters mutually exclusive
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1359140 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 13:07:10 +00:00
Oleg Kalnichevski
d545fdd180
Deprecated #setQuery method; added method to set arbitrary custom query component
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1356775 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 15:02:44 +00:00
Oleg Kalnichevski
b7f85c1af7
Upgraded project version to 4.2.2-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1356623 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 08:52:49 +00:00
Oleg Kalnichevski
8a19a0e2b9
Escape non-ASCII chars using \uxxxx notation
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1355754 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 16:01:56 +00:00
Oleg Kalnichevski
2706c4b463
Added Quick Start sources; fixed release notes header
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1355393 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 13:59:57 +00:00
Sebastian Bazley
413c41202b
HTTPCLIENT-1195 - URIBuilder-created query strings are double-escaped
...
Add [ ] to reserved chars
Use separate safe sets for userinfo and fragment
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1354288 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 23:23:21 +00:00
Sebastian Bazley
caade0db95
Add test to check that builder behaves the same as URI
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1354115 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 17:17:05 +00:00
Sebastian Bazley
518e6da29d
Change form encoded escaping to agree with previous release and browsers
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1354111 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 17:05:00 +00:00
Sebastian Bazley
f32198b1fb
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1354053 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 15:10:16 +00:00
Sebastian Bazley
54f6fbf596
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1354046 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 14:57:30 +00:00
Sebastian Bazley
4efc8af634
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353782 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 00:25:44 +00:00
Sebastian Bazley
70a217c4d6
Add tests for charset String version of parse
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353699 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 18:58:17 +00:00
Sebastian Bazley
8a45b8bc44
Rename private methods to make their function clearer
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353698 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 18:57:26 +00:00
Sebastian Bazley
35d3f7ec77
Simplify nested if
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353697 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 18:33:21 +00:00
Oleg Kalnichevski
158ca6f4a0
HTTPCLIENT-1195: minor optimization
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353678 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:35:34 +00:00
Sebastian Bazley
3d3457f458
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353642 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 16:31:24 +00:00
Oleg Kalnichevski
faef016a2c
HTTPCLIENT-1201: Quick start doc improvements
...
Contributed by miles zarathustra <albert.bradley at thomsonreuters.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353605 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 15:43:28 +00:00
Oleg Kalnichevski
2e9220e97b
HTTPCLIENT-1195: blanks in the query part of request URIs to be encoded as '+'
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353593 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 15:28:41 +00:00
Sebastian Bazley
9dcf1ebd67
HTTPCLIENT-1195 - URIBuilder-created query strings are double-escaped
...
Move normalization from URIUtils to URIBuilder so encodedPath is not dropped
Oops - don't do double normalisation
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353446 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 09:56:22 +00:00
Sebastian Bazley
77ba1e5e0d
HTTPCLIENT-1195 - URIBuilder-created query strings are double-escaped
...
Move normalization from URIUtils to URIBuilder so encodedPath is not dropped
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353445 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 09:53:07 +00:00
Sebastian Bazley
b4d78c4d69
Unused import
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353369 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 00:59:31 +00:00
Sebastian Bazley
0bef1af005
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353368 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 00:58:19 +00:00
Sebastian Bazley
9fe5039310
Add String version of format test
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353366 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 00:07:56 +00:00
Sebastian Bazley
94f76c998f
Eclipse says: contentType cannot be null here
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353365 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 23:56:29 +00:00
Sebastian Bazley
21471f8486
Add tests for port and scheme copy
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353363 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 23:48:49 +00:00
Sebastian Bazley
09527b3f74
Javadoc
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353361 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 23:31:19 +00:00
Sebastian Bazley
1505d6dca6
Fix up query test cases so they are actually queries
...
Add extra encoded & to path tests
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353266 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 13:58:11 +00:00
Sebastian Bazley
9db01c3144
HTTPCLIENT-1195 - URIBuilder-created query strings are double-escaped
...
Ensure escapedQuery is not unescaped - fixes failed test testEscapedSpaceInQueryAbsolute
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353253 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 12:26:45 +00:00
Sebastian Bazley
3e1493d94c
Restore from TestUriEscapes.java@1349668
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353122 13f79535-47bb-0310-9956-ffa450edef68
2012-06-23 12:43:31 +00:00
Oleg Kalnichevski
1863df4df9
HTTPCLIENT-1210: HttpRequestBase#toString() method
...
Contributed by Gary D. Gregory <garydgregory at gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1353104 13f79535-47bb-0310-9956-ffa450edef68
2012-06-23 09:53:11 +00:00
Oleg Kalnichevski
da16fdc973
HTTPCLIENT-1209: Redirect URIs are now normalized
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1352845 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 11:05:10 +00:00
Oleg Kalnichevski
ddde53711c
Remove user info from request URI when rewriting
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1351478 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 20:27:59 +00:00
Oleg Kalnichevski
2e3efc7d27
HTTPCLIENT-1195: URI rewrite methods in URIUtils now use URIBuilder internally
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1349669 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 07:56:35 +00:00
Oleg Kalnichevski
637f046eb1
HTTPCLIENT-1195: URIBuilder now uses single argument URI constructor to create URI instance
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1349530 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 21:11:47 +00:00
Oleg Kalnichevski
e8bc96c549
Request URI does not always get updated
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1347596 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 12:59:37 +00:00
Jonathan Moore
2451e5dec7
HTTPCLIENT-1199: Added unit test to verify Oleg's recent fix.
...
We still do not properly handle the redirect case, however.
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1345217 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 14:53:17 +00:00
Oleg Kalnichevski
f785d0ed7a
HTTPCLIENT-1199: fixed request wrapping in DecompressingHttpClient
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1345166 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 13:26:53 +00:00
Jonathan Moore
2514a05895
Compiler warning cleanup: unused imports and unneeded @SuppressWarnings.
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1344851 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 18:25:49 +00:00
Oleg Kalnichevski
a64a3e252e
HTTPCLIENT-1200: DecompressingHttpClient fails to generate correct HttpHost context attribute
...
Contributed by Guillaume Castagnino <casta+jira at xwing.info>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1344743 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 14:28:38 +00:00
Oleg Kalnichevski
5300548a56
HTTPCLIENT-1192: URIBuilder encodes query parameters twice
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1343355 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 18:29:50 +00:00
Oleg Kalnichevski
0da3e7251e
HTTPCLIENT-1193: Fixed regression in the route tracking logic of the default connection manager causing cross-site redirect failures.
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1342677 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 15:13:43 +00:00
Oleg Kalnichevski
570aa9fa37
Upgraded project version to 4.2.1-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1340700 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 12:51:21 +00:00
Oleg Kalnichevski
91250b2a89
Reverted change to the public const value
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1339141 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 12:41:45 +00:00
Oleg Kalnichevski
ae4ebcc630
Added missing AL header
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1339140 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 12:41:02 +00:00
Oleg Kalnichevski
2e2f6c2e04
HTTPCLIENT-1191: PATCH HTTP method
...
Contributed by Alin Vasile <alinachegalati at yahoo dot com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1339134 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 12:21:24 +00:00
Oleg Kalnichevski
c850967c01
Javadoc fixes
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1337904 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 14:57:27 +00:00
Oleg Kalnichevski
561a7d7405
Reverted to using basic connection manager per default
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1337903 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 14:57:07 +00:00
Oleg Kalnichevski
7a207ae475
Removed code deprecated in release 4.0
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1337893 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 14:11:39 +00:00
Oleg Kalnichevski
a8d2e5e5fa
Added release version to deprecation annotations; removed references to deprecated methods / classes
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1335088 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:06:11 +00:00
Oleg Kalnichevski
aa412a29b9
Deprecated DefaultResponseParser in favor of DefaultHttpResponseParser
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1334646 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 14:41:38 +00:00
Oleg Kalnichevski
bfe3b7201f
Added getters to URIBuilder
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1334634 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 14:17:01 +00:00
Oleg Kalnichevski
6920b38823
UrlEncodedFormEntity constructors added in 4.2 no longer throw UnsupportedEncodingException
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1334630 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 13:58:20 +00:00
Oleg Kalnichevski
93296a4779
Upgraded to HttpCore 4.2; Fixed compile errors caused by API breakage (HTTPCLIENT-1189)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1334436 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 15:53:45 +00:00
Oleg Kalnichevski
63d06f06cd
HTTPCLIENT-1186: State of newly created connections in the connection pool is not always correctly updated potentially allowing those connections to be leased to users with a different security context
...
Contributed by Ralf Pöhlmann <rpn at methodpark.de>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1329811 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 15:55:07 +00:00
Oleg Kalnichevski
9366926296
Renamed CompressionDecorator to DecompressingHttpClient
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311967 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:19:20 +00:00
Oleg Kalnichevski
26241e51e2
HTTPCLIENT-1180: Fixed NPE in ClientGZipContentCompression sample
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311952 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:36:49 +00:00
Oleg Kalnichevski
a9c95e057f
HTTPCLIENT-1182: constructor to org.apache.http.conn.ssl.SSLSocketFactory to allow for directly wrapping a javax.net.ssl.SSLSocketFactory socketfactory
...
Contributed by Mark Claassen <mclaassen at ocie.net>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311941 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:22:40 +00:00
Oleg Kalnichevski
db9f011a83
SSLSocketFactory to use javax.net.ssl.SSLSocketFactory#createSocket() instead of new Socket()
...
Contributed by Mark Claassen <mac01at donnell.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311409 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 20:10:18 +00:00
Oleg Kalnichevski
be6347aef0
HTTPCLIENT-1177: always remove fragments from request URIs
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311382 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:18:35 +00:00
Oleg Kalnichevski
0cea739a38
Removed references to deprecated API
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1311381 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:17:51 +00:00
Oleg Kalnichevski
d544026bee
BasicManagedEntity#streamClosed no longer propagates SocketException if the underlying connection has been shut down
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1307766 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 11:16:45 +00:00
Oleg Kalnichevski
218edab9fd
Un-deprecated #parse method that takes Scanner as a parameter
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1302482 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 14:47:44 +00:00
Oleg Kalnichevski
5e0e2efe13
Optimized URLEncodedUtils#parse(HttpEntity) method
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1302360 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 10:33:16 +00:00
Jonathan Moore
3f99045e4f
HTTPCLIENT-1164: If we uncompress an entity on-the-fly, we should
...
also remove its Content-MD5 header, as it will likely no longer be
accurate, and an upstream consumer may incorrectly reject the
response on that basis. This way the decorator preserves semantic
transparency.
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1301572 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 15:01:27 +00:00
Jonathan Moore
54c7e992fb
HTTPCLIENT-1164: Implemented a new CompressionDecorator aimed at replacing
...
the ContentEncodingHttpClient. This reuses the same request/response
interceptors with some minor additions to make the resulting response
semantically consistent (i.e. if a response is uncompressed, we mark the
entity as having an unknown length and remove the Content-Length header
before passing the response upstream). This allows the CompressionDecorator
and CachingHttpClient to be wired around a DefaultHttpClient in either order
and still get cache hits, depending on whether you want to cache compressed
or uncompressed bodies.
Minor change to ResponseContentEncoding to set a context variable that the
uncompression was applied. Only other change was to deprecate the
ContentEncodingHttpClient.
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1301090 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 17:02:07 +00:00
Oleg Kalnichevski
cef44fa283
Better SSL initialization for fluent Executor
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1299041 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 20:42:32 +00:00
Oleg Kalnichevski
a32899e446
ClientPNames.VIRTUAL_HOST has no effect if set at the client level
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1296612 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 12:28:59 +00:00
Oleg Kalnichevski
b90f31138c
Fixed broken test case
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1294612 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 12:16:20 +00:00
Oleg Kalnichevski
3d2b0023fe
It is legal for AuthScheme to be null
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1294348 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 21:44:50 +00:00
Oleg Kalnichevski
647e4dc314
HTTPCLIENT-1166: more tolerant parsing logic for malformed uris with invalid authority part
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1244105 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 16:12:02 +00:00
Oleg Kalnichevski
d87d45a618
HTTPCLIENT-1166: added more tests for URIUtils#extractHost
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1243989 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 15:24:18 +00:00
Oleg Kalnichevski
eac4ae43a7
Fixed problem with the system SSL context initialization (seems to affect Windows only)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1243661 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 19:19:35 +00:00
Oleg Kalnichevski
d969fe8774
HTTPCLIENT-1162: do not override 'Accept-Encoding' header if already present
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1242782 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 14:14:30 +00:00
Oleg Kalnichevski
747593abb7
Upgraded project version to 4.2-beta2-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1242454 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 18:40:08 +00:00
Sebastian Bazley
ca66db5ade
Remove svn:executable prop
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1241167 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 20:40:12 +00:00
Oleg Kalnichevski
39117086b3
HTTPCLIENT-1160: Deprecated LayeredSchemeSocketFactory in favor of SchemeLayeredSocketFactory whose #createLayeredSocket() method takes HttpParams as an additional parameter
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1240721 13f79535-47bb-0310-9956-ffa450edef68
2012-02-05 13:18:02 +00:00
Oleg Kalnichevski
24b8a78846
Upgraded to HttpCore 4.2-beta1
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1239223 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 17:36:32 +00:00
Oleg Kalnichevski
64e56ef29c
Added an option to initalize BASIC and DIGEST schemes in a particular challenge state
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1235752 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 14:17:37 +00:00
Oleg Kalnichevski
67d45c0d06
Updated Kerberos example
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1235751 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 14:16:29 +00:00
Oleg Kalnichevski
9867254c97
HTTPCLIENT-1156: Refactored NegotiateScheme into separate SPNegoScheme and KerberosScheme implementations; deprecated NegotiateScheme and related classes
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1233319 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 12:33:51 +00:00
Oleg Kalnichevski
74e1be5ca8
HTTPCLIENT-1159: HttpClientUtils - helper methods to release resources held by HttpClient / HttpResponse after use
...
Contributed by Karthik K <oss.akk at gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1233307 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 12:15:48 +00:00
Oleg Kalnichevski
fcf77abb6c
HTTPCLIENT-1158: fixed typo
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1232915 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 14:46:25 +00:00
Oleg Kalnichevski
3b8726022b
Added convenience #create methods to UrlEncodedFormEntity
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1231075 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 14:05:24 +00:00
Oleg Kalnichevski
46bcf3acf7
Replaced deprecated method calls
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1228888 13f79535-47bb-0310-9956-ffa450edef68
2012-01-08 16:34:06 +00:00
Oleg Kalnichevski
8f767628cf
HTTPCLIENT-1155: CachingHttpClient fails to ensure that the response content gets fully consumed when using a ResponseHandler, which can potentially lead to connection leaks
...
Contributed by James Miller <jamesmiller01 at gmail dot com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1222845 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 20:59:54 +00:00
Oleg Kalnichevski
5dffa49321
Corrected debug log message
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1197196 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 16:03:58 +00:00
Oleg Kalnichevski
ae8e671030
HTTPCLIENT-1142: Infinite loop on NTLM authentication failure
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1197194 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 15:58:05 +00:00
Oleg Kalnichevski
7541429cf2
Upgraded project version to 4.2-alpha2-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1196788 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 20:19:52 +00:00
Oleg Kalnichevski
d7d7bb2bde
Fixed javadoc warnings
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1195170 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 14:32:39 +00:00
Oleg Kalnichevski
732095943f
Redesigned auth caching
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1182515 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 18:33:15 +00:00
Oleg Kalnichevski
4d1b157272
Updated AuthState API
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1182317 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 11:45:54 +00:00
Oleg Kalnichevski
9edd1acd4f
HTTPCLIENT-1136: fixed synchronization problem in #releaseConnection method
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181989 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 17:52:00 +00:00
Oleg Kalnichevski
2278378495
HTTPCLIENT-1129: Do not modify auth state on redirect if not redirecting to another host
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181901 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 17:22:08 +00:00
Oleg Kalnichevski
09f10b0f6e
Renamed test classes
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181740 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 12:10:43 +00:00
Oleg Kalnichevski
5d6404cbca
BasicClientConnectionManager to replace SingleClientConnManager
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181739 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 12:10:20 +00:00
Oleg Kalnichevski
94dea64e63
HTTPCLIENT-1123: DNS resolver null parameter check
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181737 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 12:09:55 +00:00
Oleg Kalnichevski
960ee2f581
HTTPCLIENT-1123: fixed broken PoolingClientConnectionManager constructor
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181208 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 20:18:24 +00:00
Oleg Kalnichevski
d1450f9071
HTTPCLIENT-1123: added @since 4.2 tag
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181192 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 20:03:53 +00:00
Oleg Kalnichevski
287d839410
HTTPCLIENT-1128: SystemDefaultHttpClient to take http.keepAlive and http.maxConnections system properties into account
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181130 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 18:46:08 +00:00
Oleg Kalnichevski
e41274c27d
Fixed broken test case
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181127 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 18:41:37 +00:00
Oleg Kalnichevski
da570f7079
HTTPCLIENT-1129: Better handling of unexpected authentication failures in the SUCCESS auth state
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181082 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 17:22:32 +00:00
Oleg Kalnichevski
8f46fbacd8
Better state handling in NegotiateScheme#authenticate
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181015 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 15:17:26 +00:00
Oleg Kalnichevski
90b6853111
HTTPCLIENT-1128: SystemDefaultHttpClient to use ProxySelectorRoutePlanner
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1181014 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 15:17:08 +00:00
Oleg Kalnichevski
7f04b88f12
HTTPCLIENT-1128: added SystemDefaultHttpClient, an extension of DefaultHttpClient pre-configured using system properties
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180994 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 14:28:07 +00:00
Oleg Kalnichevski
420fc2604f
HTTPCLIENT-1128: added factory method to create SSLSocketFactory instances initialized using system properties
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180993 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 14:27:45 +00:00
Oleg Kalnichevski
f2aa481280
Removed unused imports
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180376 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 13:44:07 +00:00
Oleg Kalnichevski
28de736437
HTTPCLIENT-1127: a better fix for the deal-lock between SingleClientConnManager.releaseConnection() and SingleClientConnManager.shutdown(); previous fix may have broken ThreadSafeClientConnManager
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180361 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 11:50:48 +00:00
Oleg Kalnichevski
6bd3da869d
Added method to SchemeRegistryFactory to initialize default scheme registry using system properties
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180360 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 11:50:01 +00:00
Oleg Kalnichevski
162f3d6d99
HTTPCLIENT-1131: HttpClient to authenticate preemptively using BASIC scheme if a userinfo attribute is specified in the request URI
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180120 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 17:49:42 +00:00
Oleg Kalnichevski
430c3d530e
Improved auth state tracking in HttpHttpAuthenticator
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180056 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 14:35:40 +00:00
Oleg Kalnichevski
427d2c24e0
HTTPCLIENT-1134: make BasicResponseHandler consume response content in case of an unsuccessful result (status code >= 300)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1180014 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 12:14:49 +00:00
Oleg Kalnichevski
4f83ddb3e5
HTTPCLIENT-1132: ProxyClient implementation
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1179817 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 20:16:59 +00:00
Oleg Kalnichevski
6a6ee3737c
Removed misleading comment
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1179744 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 18:21:33 +00:00
Oleg Kalnichevski
0c00bef71e
HTTPCLIENT-1127: fixed dead-lock between SingleClientConnManager and AbstractPooledConnAdapter
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1179609 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 13:07:33 +00:00
Oleg Kalnichevski
62c57991f5
HTTPCLIENT-1120: AbstractPoolEntry to throw InterruptedIOException instead of plain IOException; HttpRequest to be added to the execution context prior to attempting to open connection (in case of a connect failure the retry handler can make use of the HttpRequest object bound to the context)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1179594 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 12:34:21 +00:00
Oleg Kalnichevski
b1b85307a8
HTTPCLIENT-1120: moved test cases for abort handling to TestAbortHandling
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1179593 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 12:33:11 +00:00
Oleg Kalnichevski
a38281b7f2
Fixed broken test case
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1178648 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 00:39:13 +00:00
Oleg Kalnichevski
76f66f4caa
HTTPCLIENT-1107: test case for auth scheme fallback mechanism in case of multiple auth options
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1178640 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:51:45 +00:00
Oleg Kalnichevski
53883ec597
Unit tests for AuthenticationStrategyImpl
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1178616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 22:17:01 +00:00
Sebastian Bazley
bcc97c838f
Replace greedy imports with specific ones
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1178262 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 22:16:47 +00:00
Oleg Kalnichevski
6b1ef7da2b
HTTPCLIENT-1130: LaxRedirectStrategy improvements
...
Contributed by Alin Vasile <alinachegalati at yahoo.com> and Ryan Smith <rsmith at opensourcemasters.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1177980 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 13:59:33 +00:00
Oleg Kalnichevski
6ae3bb8bc8
Unit tests for HttpAuthenticator
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1177977 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 13:41:37 +00:00
Oleg Kalnichevski
0cad2defa7
HTTPCLIENT-1107: support for multiple auth options (first cut)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1177782 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 19:16:15 +00:00
Oleg Kalnichevski
c514ac2a4c
Renamed AuthChallengeState to AuthProtocolState
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1176369 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 13:05:46 +00:00
Sebastian Bazley
e4ea515f20
HTTPCLIENT-1120 - DefaultHttpRequestRetryHandler#retryRequest should not retry aborted requests
...
Part two - still need to test connection abort (and fix if necessary)
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1176137 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 00:06:07 +00:00
Sebastian Bazley
9a701bfbe4
Suppress boxing warning for test case
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175961 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 17:28:53 +00:00
Oleg Kalnichevski
145d0c1f3c
HTTPCLIENT-1107: deprecated AuthenticationHandler in favor of new AuthenticationStrategy
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175433 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 17:27:22 +00:00
Oleg Kalnichevski
70a34914ba
HTTPCLIENT-1107: better tracking of auth challenge state transitions
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175415 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 15:49:27 +00:00
Oleg Kalnichevski
3853906d7d
HTTPCLIENT-1107: support auth scheme switching
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175378 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 12:38:43 +00:00
Oleg Kalnichevski
c4d1599bd0
HTTPCLIENT-1107: auth framework redesign
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175377 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 12:25:07 +00:00
Oleg Kalnichevski
e5d83200fd
HTTPCLIENT-1107: auth framework redesign
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1175375 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 11:56:14 +00:00
Sebastian Bazley
47c6fa809f
isDebugEnabled can only be true if isInfoEnabled is true, so don't perform a useless check
...
Also might as well merge the other log.info into the block
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1174784 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 14:07:26 +00:00
Oleg Kalnichevski
04626cb5ed
Always shut down HttpClient used in local server based tests
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1174702 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 12:31:31 +00:00
Oleg Kalnichevski
28fbd4df7c
Use new pooling connection manager per default
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1174683 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 12:06:12 +00:00
Oleg Kalnichevski
9ee4a41aa3
Upgraded HttpCore to version 4.2-alpha2
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1174627 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 09:53:42 +00:00
Oleg Kalnichevski
eab98043c4
Renamed UriBuilder to URIBuilder
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1172642 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 14:34:47 +00:00
Oleg Kalnichevski
40a0ed44d2
Rewrite of UriBuilder
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1172634 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 13:55:58 +00:00
Oleg Kalnichevski
e5ea32b76d
TABS -> SPACES
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1172301 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 16:20:20 +00:00
Sebastian Bazley
5e1f6e6eb6
Explicit boxing
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1170168 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 13:14:57 +00:00
Sebastian Bazley
2ecea22e6d
Annotations are now in httpcore
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1170154 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 12:45:53 +00:00
Sebastian Bazley
01b39c4883
Add version variables for report plugins
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1167667 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 03:28:11 +00:00
Oleg Kalnichevski
fb4bbe08d1
Updated javadocs
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1166554 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 07:56:00 +00:00
Oleg Kalnichevski
7009ad7d0f
Simplified InMemoryDnsResolver#add method
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1166362 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 20:04:38 +00:00
Oleg Kalnichevski
57ea057594
HTTPCLIENT-1123: Support for pluggable DNS resolvers (default resolver).
...
Contributed by Alin Vasile <alinachegalati at yahoo dot com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1165863 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 21:27:48 +00:00
Oleg Kalnichevski
d65b529e08
Fixed broken test case
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1165646 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 12:49:00 +00:00
Oleg Kalnichevski
ce13e3606f
HTTPCLIENT-1123: Support for pluggable DNS resolvers.
...
Contributed by Alin Vasile <alinachegalati at yahoo dot com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1165635 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 12:20:26 +00:00
Sebastian Bazley
5d554ccf26
HTTPCLIENT-1120 - DefaultHttpRequestRetryHandler#retryRequest should not retry aborted requests
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1164052 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 12:45:02 +00:00
Sebastian Bazley
df91357884
Javadoc syntax
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1163467 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 01:26:50 +00:00
Oleg Kalnichevski
102ed1e844
Redesigned connection management code based on HttpCore 4.2 API (merged from conn-mgmt-redesign branch)
...
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1160635 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 11:32:53 +00:00