4bd1a041f7
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
2013-11-04 15:00:17 -07:00
2c9ea8d4b7
Windows build fixes
2013-11-04 14:59:47 -07:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
3066b673e9
Merged branch 'master' into 'jetty-9.1'.
2013-10-28 11:18:09 +01:00
3a10aa4164
419964 - InputStreamContentProvider does not close provided
...
InputStream.
Now closing the provided InputStream when reading -1 or when an
exception is thrown.
2013-10-28 11:13:17 +01:00
abac85e129
420364 - Bad synchronization in HttpConversation.
2013-10-25 14:55:48 +02:00
b9fcd6695c
Merged via cherry-pick branch 'master' into 'jetty-9.1'.
2013-10-25 14:21:11 +02:00
a28e4730ad
420362 - Response/request listeners called too many times.
...
Wrapped on[Request|Response]XXX(XXXListener) listeners into their
specific interface so that they don't get notified multiple times.
2013-10-25 14:08:55 +02:00
2e434ef1e8
Refactored HttpDestinationOverHTTP into a PoolingHttpDestination
...
base class for reuse from other transports.
2013-10-25 13:02:33 +02:00
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
1df50f86f9
Improved logging and toString() implementations.
2013-10-22 19:17:35 +02:00
8d9fd6ad71
Improved connection/destination close, so that a connection can
...
always notify its destination that it has been closed.
2013-10-22 18:00:55 +02:00
c705bb9480
Avoid overwrite of the abort cause.
2013-10-22 14:03:09 +02:00
dcbc0d9a21
Merged branch 'master' into 'jetty-9.1'.
2013-10-22 13:34:06 +02:00
1ce2ec0007
420039 - BufferingResponseListener continues processing after
...
aborting request.
2013-10-22 13:33:19 +02:00
41eed8f836
419904 - Data corruption on proxy PUT requests.
...
Fixed InputStreamContentProvider to not reuse the byte[] to read from
the stream.
2013-10-22 12:40:32 +02:00
eaefd17652
420012 - Improve ProxyServlet.Transparent configuration in case prefix="/".
2013-10-21 22:41:39 +02:00
0c80567c12
Using StandardCharset fields instead of Charset.forName().
2013-10-21 16:14:18 +02:00
208382b07d
Removed test dependencies on Ning's and Apache's HTTP client.
2013-10-21 11:27:23 +02:00
5cc0247a67
Merged branch 'master' into 'jetty-9.1'.
2013-10-21 10:49:15 +02:00
4b2756c4b0
419950 - Provide constructor for StringContentProvider that takes
...
Charset.
2013-10-21 10:48:34 +02:00
df209b7b70
419901 - Client always adds extra user-agent header.
...
Fixed handling of the user agent header.
2013-10-21 10:42:41 +02:00
88541bef2f
Merged branch 'master' into 'jetty-9.1'.
2013-10-21 10:41:01 +02:00
9fd27b2f8b
419901 - Client always adds extra user-agent header.
...
Added test case.
2013-10-21 10:39:37 +02:00
7520389c91
419901 - Client always adds extra user-agent header.
...
Improved test case.
2013-10-21 10:39:06 +02:00
b46af29a42
419901 - Client always adds extra user-agent header.
...
Added test case.
2013-10-21 10:28:34 +02:00
c44537fca8
419899 Do not wrap SSL Exception as EoFException
2013-10-21 16:29:20 +11:00
2d6190da59
Refactored class Fields to a better API.
2013-10-18 13:55:49 +02:00
c1832b29fb
Merged branch 'master' into 'jetty-9.1'.
2013-10-17 12:37:37 +02:00
7618826349
419687 - HttpClient's query parameters must be case sensitive.
...
Modified class Fields to take a boolean parameter that defines
whether it is case sensitive or not, and updated HttpRequest to use
a case sensitive Fields instance for the query parameters.
2013-10-17 12:37:01 +02:00
e408bd64c7
Improved HttpClient's proxy configuration by using Strings as
...
included and excluded addresses. This allows to pass in Strings such
as 127.0.0.1/8 or other wildcard formats.
2013-10-17 10:44:39 +02:00
45e6ac2a5d
Javadocs: clarified that timeouts are in milliseconds.
2013-10-16 17:23:32 +02:00
114a95234b
Merged branch 'master' into 'jetty-9.1'.
2013-10-16 16:30:04 +02:00
45828ee906
418892 - SSL session caching so unreliable it effectively does not
...
work.
Fixed by making sure that we completely decrypt read bytes.
Before the fix, it was possible that we returned after the decryption
of one TLS frame, while another was still present in the
_encryptedBuffer.
This lead to non-clean closes of the connection, which hampered the
capability of session reuse by clients.
Now we decrypt in a loop and only return if there is nothing more
that we can decrypt.
2013-10-16 16:27:36 +02:00
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
25d9b8704f
417356 - Add SOCKS support to jetty client.
...
Big refactoring to allow for additional proxy schemes that work at a
lower level than HTTP.
Introduced client-side ConnectionFactory, and binding that to a
HttpDestination, so that connections to that destination will use the
same ConnectionFactory.
The destination's ConnectionFactory is now initialized from the proxy
configuration and the transport, which is now itself a
ConnectionFactory.
The proxy configuration has also changed becoming polymorphic by
introducing a new ProxyConfiguration.Proxy abstract class,
which is implemented as HTTPProxy and can be implemented in future as
SOCKS4Proxy (and possibly others).
2013-10-08 15:06:39 +02:00
8cb1001007
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-01 09:12:43 +10:00
a6f0883ca3
Remove explicit port number from jetty-client SslBytesClientTest
2013-10-01 09:05:05 +10:00
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
6146f0cc9c
cleanup threadpool usage
2013-09-30 14:07:17 +10:00
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
5c72f6975a
[maven-release-plugin] prepare for next development iteration
2013-09-16 11:06:25 -07:00
9d26e0b32a
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-09-16 11:06:18 -07:00
e53029ac8e
[maven-release-plugin] rollback the release of jetty-9.1.0.M0
2013-09-16 10:41:04 -07:00
07abfa0c5d
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-09-16 10:25:54 -07:00
Joakim Erdfelt
Greg Wilkins
Mikhail Mazursky
Simone Bordet
Jan Bartel
Jesse McConnell