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
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
8eb683f9b5
fixed merge
2013-10-14 18:00:53 +11:00
1d5730d8d2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-14 17:19:09 +11:00
b8c8abae2e
419333 treat // as an alias in path
2013-10-14 17:16:54 +11:00
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
9a330dad1b
418767 run-forked goal ingores test scope dependencies with useTestScope=true
2013-10-14 16:51:59 +11:00
8f9f14c5c3
407716 fixed logs
2013-10-14 14:08:32 +11:00
a3424532e8
fixed bad merge
2013-10-14 13:44:52 +11:00
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
ad124b6888
419309 Added symlink checker to test webapp
2013-10-14 11:59:18 +11:00
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
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
33dedd15f9
Typo fix
2013-10-11 10:49:13 +02:00
1eca1e7c3c
Making subprotocol negotiation behavior report warnings on bad configuration
2013-10-10 09:04:45 -07:00
2944339893
Fixing websocket browser test utility header lookup
2013-10-10 08:43:49 -07:00
8f4a403d4e
419146 - Parameterize etc/jetty-requestlog.xml values
2013-10-10 08:42:29 -07:00
646b4c929b
Fixing invalid javadoc
2013-10-10 07:31:56 -07:00
3886cc2dc5
Merged branch 'jetty-9.1' into 'http_client_connection_factories'.
2013-10-08 15:08:07 +02: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
180d9a55df
418792 - Session getProtocolVersion always returns null
...
+ Backporting just the getProtocolVersion from jetty 9.1
2013-10-07 16:45:21 -07:00
90b7a3fc23
Use servlet context temp directory from ${jetty.base}/work, not ${jetty.home}/work
2013-10-07 12:02:05 -07:00
a1775c4415
Fixing javadoc
2013-10-07 11:59:04 -07:00
9daf520994
Adding @Test(timeout=60000) to prevent build hang
2013-10-04 15:27:10 -07:00
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
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
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
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
d505350a9f
418596 Faults in JARs during class scanning should report the jar that caused the problem
2013-10-04 11:02:06 +10:00
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
d535cb9c92
continuations is an optional module
2013-10-04 08:22:27 +10:00
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
1620b34a6e
418441 - Use of OPTIONS= in Jetty 9.1 should display WARNING message
2013-10-03 11:53:37 -07:00
4a27f3bf4e
Fixing javadoc error
2013-10-03 11:09:41 -07:00
d2c3d7cf09
418603 - cannot specify a custom ServerEndpointConfig.Configurator
...
+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:13:37 -07:00
562cf009f0
Fixing javadoc
2013-10-03 09:13:37 -07:00
2d53fe8744
cleaned up demo
2013-10-03 18:43:06 +10:00
8b305e208c
397049 Cannot Provide Custom Credential to JDBCLoginService
2013-10-03 16:21:34 +10:00
499d811ba7
Merge branch 'master' into jetty-9.1
2013-09-30 20:00:26 -07:00
1315096192
Disabling broken external server test
2013-09-30 20:00:02 -07:00
2d7f1a2272
ignore test dependent on external server
2013-10-01 11:18:09 +10:00
2ef92d5477
fixed proxy tests
2013-10-01 10:39:08 +10:00
3fb3616b21
remove overlay deployer for 9.1 while it gets reconsidered in new module system
2013-09-30 19:11:34 -05: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
4a917b464f
Fix JNDI test for change to ContextHandler
2013-10-01 08:04:25 +10:00
c829d7dbaa
Fixing test failure on testAttributes because of Executors assumption
2013-09-30 14:09:49 -07: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
6ec630f044
set for release
2013-09-30 12:35:22 -05:00
Simone Bordet
Greg Wilkins
Jan Bartel
Thomas Becker
Joakim Erdfelt
Jesse McConnell