Greg Wilkins
28af8a1432
fixed merge
2013-02-15 16:12:39 +11:00
Greg Wilkins
71d70922da
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-02-15 15:00:22 +11:00
Greg Wilkins
68f3319719
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-15 12:14:48 +11:00
Greg Wilkins
2581eb130a
381521 allow compress methods to be configured
2013-02-15 12:12:12 +11:00
Greg Wilkins
c7d985fa02
400859 limit max size of writes from cached content
2013-02-15 11:20:29 +11:00
Greg Wilkins
d74a8c8281
398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration
2013-02-15 11:19:04 +11:00
Simone Bordet
651105c73b
400848 - Redirect fails with non-encoded location URIs.
2013-02-14 21:37:30 +01:00
Simone Bordet
df56bd3c27
400014 - Http async client DNS performance.
...
Introduced SocketAddressResolver to perform DNS resolution in a separate thread,
and updated HttpClient to make use of it.
2013-02-14 21:37:29 +01:00
Simone Bordet
dd96cc50b2
400734 - NPE for redirects with relative location.
...
Now resolving locations against original URL if it is relative.
2013-02-14 21:37:29 +01:00
Thomas Becker
12d9d77cd7
399463 add start.ini documentation for OPTIONS. Remove reference to start_config
2013-02-14 16:59:55 +01:00
Thomas Becker
330845b3ce
399463 add start.ini documentation for OPTIONS
2013-02-14 15:55:46 +01:00
Jan Bartel
246088c2ee
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
2013-02-14 20:08:37 +11:00
Jan Bartel
b14db26464
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-14 17:27:51 +11:00
Jan Bartel
9c96892870
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
...
Reset classloaders after each test
2013-02-14 17:14:16 +11:00
Jan Bartel
ae76e07303
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
2013-02-14 15:58:24 +11:00
Joakim Erdfelt
f15d4c0376
400738 - ResourceHandler doesn't support range requests
...
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
Simone Bordet
6d0f233c80
362854 - Continuation implementations may deadlock.
...
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
Simone Bordet
ef81982579
400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
...
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
Simone Bordet
6649b890a7
400434 - Add support for an OutputStream ContentProvider.
2013-02-13 10:25:25 +01:00
Joakim Erdfelt
9ae3c94b22
399520 - Websocket needs session idle timeouts
...
+ Integrated suggestions about AbstractConnection.onReadTimeout()
+ Enabled tests on client side
2013-02-12 13:51:06 -07:00
Joakim Erdfelt
ebaffcfd27
399535 - Websocket-client connect should have configurable connect timeout
...
+ Made default value for connectTimeout be exposed from SelectorManager.
+ Added javadoc on time unit.
2013-02-12 12:56:46 -07:00
Joakim Erdfelt
5c68d23138
400512 - ClientUpgradeRequet.addExtension() should fail if extension is not installed
2013-02-12 11:37:16 -07:00
Jesse McConnell
e09d401fd2
add configuration option to not send server version
2013-02-12 10:08:56 -06:00
Thomas Becker
c840d3dbb1
400555 HttpProxyEngine: Add http version header in response
2013-02-12 12:16:05 +01:00
Joakim Erdfelt
4daba06175
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
...
+ Adding testcase that replicated failure reported in issue
+ Fixing AnnotatedEventDriver error with input size
+ Fixing WebSocketSession detection of isOpen()
+ Fixing BigEchoSocket test for session.isOpen()
2013-02-11 16:50:01 -07:00
Joakim Erdfelt
d505f481a4
400255 - Using WebSocket.maxMessageSize results in IllegalArgumentException
2013-02-11 16:24:13 -07:00
Thomas Becker
ade135ba74
Add ProxySPDYToSPDYLoadTest
2013-02-07 12:21:05 +01:00
Thomas Becker
bb3c1433f4
400184: SslContextFactory change. Disable hostname verification if trustAll is set
2013-02-07 11:50:19 +01:00
Joakim Erdfelt
a9f6f30242
Merge branch 'jetty-7' into jetty-8
2013-02-05 18:08:15 -07:00
Joakim Erdfelt
14e24c97aa
400040 - NullPointerException in HttpGenerator.prepareBuffers
...
+ Adding safety check on _header use
2013-02-05 18:07:23 -07:00
Joakim Erdfelt
65c2112964
Making Jsp tests work on JDK's less than 7
2013-02-05 18:00:58 -07:00
Joakim Erdfelt
ddfec4a504
Minor javadoc plugin edit
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
10ecd17375
Updating VERSION.txt top section
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
7e7b316c85
Rolling back VERSION.txt
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Jesse McConnell
c9a20587c5
set for release
2013-02-05 10:00:35 -07:00
Joakim Erdfelt
b810ce6535
Adding synchronize for multi-threaded write concerns
2013-02-01 09:20:33 -07:00
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Jan Bartel
0569957e3a
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-01 22:23:04 +11:00
Greg Wilkins
626f10678c
Merge remote-tracking branch 'origin/jetty-8'
...
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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/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-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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/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-plus/pom.xml
jetty-policy/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-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 22:15:44 +11:00
Jan Bartel
d7920f236f
398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration
2013-02-01 18:58:46 +11:00
Greg Wilkins
e8de7bd905
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/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-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/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-policy/pom.xml
jetty-rewrite/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-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 18:22:04 +11:00
Greg Wilkins
1610329d3e
399703 made encoding error handling consistent
2013-02-01 15:31:55 +11:00
Greg Wilkins
7b7a6dc03a
jetty-9 added properties to start.ini
2013-02-01 12:08:22 +11:00
Greg Wilkins
29f155143e
jetty-9 removed debug
2013-02-01 12:08:22 +11:00
Jan Bartel
6711abe1d7
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-02-01 11:28:30 +11:00
Jan Bartel
d5f03ea791
websocket-client should not be needed on osgi server test classpath
2013-02-01 11:27:38 +11:00
