Simone Bordet
16b317ea60
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest
...
hangs.
2013-10-17 10:44:39 +02:00
Jan Bartel
557b12a082
416300 Order ServletContainerInitializer callbacks
2013-10-17 18:37:24 +11:00
Greg Wilkins
27a3ceeb27
Optimised SelectorManager to avoid changeQ for interest ops
2013-10-17 12:43:28 +11:00
Simone Bordet
6c2a14396e
410840 - Change SSLSession.getPeerCertificateChain() to
...
SSLSession.getPeerCertificates().
2013-10-16 17:31:40 +02:00
Simone Bordet
879c3eb6f5
Improved code in case of connection failures: close the connection,
...
and cancel the connect timeout task.
2013-10-16 17:24:43 +02:00
Simone Bordet
45e6ac2a5d
Javadocs: clarified that timeouts are in milliseconds.
2013-10-16 17:23:32 +02:00
Simone Bordet
8bd6ab0beb
Removed class SocketBased, not necessary.
2013-10-16 16:36:23 +02:00
Simone Bordet
114a95234b
Merged branch 'master' into 'jetty-9.1'.
2013-10-16 16:30:04 +02:00
Simone Bordet
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
Simone Bordet
e85f34612c
419344 - NPNServerConnection does not close the EndPoint if it reads
...
-1.
Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:29:47 +02:00
Simone Bordet
8fec401b06
419344 - NPNServerConnection does not close the EndPoint if it reads
...
-1.
Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:26:00 +02:00
Greg Wilkins
8eb683f9b5
fixed merge
2013-10-14 18:00:53 +11:00
Greg Wilkins
1d5730d8d2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-14 17:19:09 +11:00
Greg Wilkins
b8c8abae2e
419333 treat // as an alias in path
2013-10-14 17:16:54 +11:00
Jan Bartel
278dab08b8
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
2013-10-14 17:03:02 +11:00
Jan Bartel
9a330dad1b
418767 run-forked goal ingores test scope dependencies with useTestScope=true
2013-10-14 16:51:59 +11:00
Greg Wilkins
8f9f14c5c3
407716 fixed logs
2013-10-14 14:08:32 +11:00
Greg Wilkins
a3424532e8
fixed bad merge
2013-10-14 13:44:52 +11:00
Greg Wilkins
defa3a04cf
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-10-14 13:10:02 +11:00
Greg Wilkins
ad124b6888
419309 Added symlink checker to test webapp
2013-10-14 11:59:18 +11:00
Greg Wilkins
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
Thomas Becker
081e7d3bbd
415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession
2013-10-11 10:51:05 +02:00
Thomas Becker
33dedd15f9
Typo fix
2013-10-11 10:49:13 +02:00
Joakim Erdfelt
1eca1e7c3c
Making subprotocol negotiation behavior report warnings on bad configuration
2013-10-10 09:04:45 -07:00
Joakim Erdfelt
2944339893
Fixing websocket browser test utility header lookup
2013-10-10 08:43:49 -07:00
Joakim Erdfelt
8f4a403d4e
419146 - Parameterize etc/jetty-requestlog.xml values
2013-10-10 08:42:29 -07:00
Joakim Erdfelt
646b4c929b
Fixing invalid javadoc
2013-10-10 07:31:56 -07:00
Simone Bordet
3886cc2dc5
Merged branch 'jetty-9.1' into 'http_client_connection_factories'.
2013-10-08 15:08:07 +02:00
Simone Bordet
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
Joakim Erdfelt
180d9a55df
418792 - Session getProtocolVersion always returns null
...
+ Backporting just the getProtocolVersion from jetty 9.1
2013-10-07 16:45:21 -07:00
Joakim Erdfelt
90b7a3fc23
Use servlet context temp directory from ${jetty.base}/work, not ${jetty.home}/work
2013-10-07 12:02:05 -07:00
Joakim Erdfelt
a1775c4415
Fixing javadoc
2013-10-07 11:59:04 -07:00
Joakim Erdfelt
9daf520994
Adding @Test(timeout=60000) to prevent build hang
2013-10-04 15:27:10 -07:00
Simone Bordet
8eaedc4a5e
Code cleanups.
...
Removed unused parameters, and renamed property "executeOnFillable"
to "dispatchIO", for similarity with HttpClient and for better
description (it names the concept, not the implementation detail).
2013-10-04 16:40:27 +02:00
Greg Wilkins
a0601be95a
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
2013-10-04 16:14:12 +10:00
Greg Wilkins
7cb553557e
418636 Name anonymous filter and holders with classname-hashcode
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
2013-10-04 16:12:53 +10:00
Greg Wilkins
52752ae142
418636 Name anonymous filter and holders with classname-hashcode
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
2013-10-04 16:10:47 +10:00
Jan Bartel
d505350a9f
418596 Faults in JARs during class scanning should report the jar that caused the problem
2013-10-04 11:02:06 +10:00
Joakim Erdfelt
a0ddb2c5d7
418632 - WebSocket / Jsr annotated @OnMessage with InputStream fails to be called
...
+ Fixed load order issue with binary vs text
+ Fixed decoder assignment for InputStream
+ Added unit tests to prevent regression of this feature
2013-10-03 16:07:49 -07:00
Greg Wilkins
d535cb9c92
continuations is an optional module
2013-10-04 08:22:27 +10:00
Joakim Erdfelt
8d5013e15f
418625 - WebSocket / Jsr RemoteEndpoint.sendObject(java.nio.HeapByteBuffer) doesn't find encoder
...
+ Adding fallback lookup using isAssignable(type) if basic map based
lookup fails first. Remembers successful isAssignable(type) match
for future lookups via basic map approach.
2013-10-03 14:05:04 -07:00
Joakim Erdfelt
1620b34a6e
418441 - Use of OPTIONS= in Jetty 9.1 should display WARNING message
2013-10-03 11:53:37 -07:00
Joakim Erdfelt
4a27f3bf4e
Fixing javadoc error
2013-10-03 11:09:41 -07:00
Joakim Erdfelt
d2c3d7cf09
418603 - cannot specify a custom ServerEndpointConfig.Configurator
...
+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:13:37 -07:00
Joakim Erdfelt
562cf009f0
Fixing javadoc
2013-10-03 09:13:37 -07:00
Greg Wilkins
2d53fe8744
cleaned up demo
2013-10-03 18:43:06 +10:00
Jan Bartel
8b305e208c
397049 Cannot Provide Custom Credential to JDBCLoginService
2013-10-03 16:21:34 +10:00
Joakim Erdfelt
499d811ba7
Merge branch 'master' into jetty-9.1
2013-09-30 20:00:26 -07:00
Joakim Erdfelt
1315096192
Disabling broken external server test
2013-09-30 20:00:02 -07:00
Greg Wilkins
2d7f1a2272
ignore test dependent on external server
2013-10-01 11:18:09 +10:00
