Greg Wilkins
ddd187882f
398467 Servlet 3.1 Non Blocking IO
...
removed experiment input handling
2013-05-28 23:30:49 +10:00
Greg Wilkins
ce662c7ddc
398467 Servlet 3.1 Non Blocking IO
...
cleaned up test harness
2013-05-28 23:29:38 +10:00
Greg Wilkins
f03bc398f8
398467 Servlet 3.1 Non Blocking IO
...
Looking at async input
2013-05-28 23:28:07 +10:00
Greg Wilkins
942f8a5c40
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-28 22:51:31 +10:00
Greg Wilkins
6f0195e0de
398467 Servlet 3.1 Non Blocking IO
...
Fixed handling of empty writes
fixed double close sendContent
2013-05-28 22:46:16 +10:00
Greg Wilkins
2fa50247b7
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-05-28 18:04:22 +10:00
Greg Wilkins
45d4cd3fcd
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-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-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-overlay-deployer/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-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipWithPipeliningTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
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-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
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-05-28 18:02:02 +10:00
Jan Bartel
5df7ab401d
Fix errors from small osgi refactor; comment out some test code
2013-05-28 15:10:12 +10:00
Jan Bartel
82b0ae2c63
Ensure jetty.home set as Server attribute on defaultJettyServer instance
2013-05-28 14:58:21 +10:00
Jan Bartel
7e797d8eed
408910 META-INF/jetty-webapp-context.xml file should be able to refer to bundle-relative locations
2013-05-28 13:10:49 +10:00
Jan Bartel
20aeae5914
409228 Set jetty.home property so config files work even if deployed inside a bundle
2013-05-28 11:35:09 +10:00
Greg Wilkins
34a0271fa3
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipWithPipeliningTest.java
2013-05-27 18:30:53 +10:00
Greg Wilkins
48c2a410b6
408909 GzipFilter setting of headers when reset and/or not compressed
...
updated some more test harnesses for etag tests
2013-05-27 17:48:08 +10:00
Greg Wilkins
6ef865b153
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-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-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-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
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-05-27 16:47:27 +10:00
Greg Wilkins
16994cbd6c
408909 GzipFilter setting of headers when reset and/or not compressed
...
The gzip filter now sets deferred headers (content-length and etag) when it decides not to commit.
Also does not allow a reset after a decision to commit
2013-05-27 16:09:12 +10:00
Greg Wilkins
288a452881
398467 Servlet 3.1 Non Blocking IO
...
some cleanup/fixes of SPDY tests. More work needed
2013-05-25 17:07:30 +10:00
Greg Wilkins
c7be106423
398467 Servlet 3.1 Non Blocking IO
...
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
Jan Bartel
5c97019be1
408923 Need to be able to configure the ThreadPool for the default jetty server in osgi
2013-05-24 16:26:13 +10:00
Greg Wilkins
94d1f4a020
398467 Servlet 3.1 Non Blocking IO
...
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
2013-05-24 14:34:27 +10:00
Greg Wilkins
6f8ed5e809
398467 Servlet 3.1 Non Blocking IO
...
Refactored HttpChannel to be ready to control onWritePossible callbacks
2013-05-23 17:34:28 +10:00
Jan Bartel
db2615ab29
408723 Jetty Maven plugin reload ignores web.xml listeners
2013-05-23 17:28:12 +10:00
Jan Bartel
f825e27275
408771 Problem with ShutdownMonitor for jetty-ant
2013-05-23 16:12:46 +10:00
Jan Bartel
8ed25ec478
408768 JSTL jars not scanned by jetty-ant
2013-05-23 16:05:09 +10:00
Jan Bartel
610499de67
408768 JSTL jars not scanned by jetty-ant
2013-05-23 11:42:36 +10:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Greg Wilkins
9e13eed9d5
Merge branch 'servlet-3.1-api' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into servlet-3.1-api
2013-05-23 09:50:04 +10:00
Greg Wilkins
79486b5949
408720 NPE in AsyncContext.getRequest()
...
Do not null the _event during the complete method
2013-05-23 09:48:06 +10:00
Jesse McConnell
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -05:00
Jesse McConnell
106a32a733
set for dev
2013-05-22 10:43:47 -05:00
Jesse McConnell
a1a6f0e5f2
Merge branch 'release-7' into jetty-7
2013-05-22 10:39:24 -05:00
Jesse McConnell
e5174f9cef
set for dev
2013-05-22 10:38:56 -05:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Jesse McConnell
cede990d41
Add package-info.java to all jetty packages
2013-05-21 15:09:49 -05:00
Joakim Erdfelt
dd3a918136
408118 - NullPointerException when parsing request cookies
...
+ Added NPE guard for non-Jetty containers.
2013-05-21 11:34:56 -07:00
Joakim Erdfelt
f403a1e185
407386 - Cookies not copied in ServletWebSocketRequest
...
+ Adding missing to super.setCookies()
+ Adding test case to prevent regression
2013-05-21 11:34:56 -07:00
Jesse McConnell
742f6a063d
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:10:07 -05:00
Jesse McConnell
b959a742d0
[Bug 404508] enable overlay deployer
2013-05-20 09:20:40 -05:00
Jesse McConnell
0858e69cb1
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
2013-05-20 07:19:25 -05:00
Jesse McConnell
497c2f7819
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:15:00 -05:00
Jesse McConnell
b32d0260c9
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
2013-05-20 07:14:52 -05:00
Jesse McConnell
3dcceaed35
Updating VERSION.txt top section
2013-05-20 06:51:30 -05:00
Jesse McConnell
e5e4f58545
Merge branch 'jetty-8' into release-8
2013-05-20 06:50:06 -05:00
Jesse McConnell
13fb43ea6d
Updating VERSION.txt top section
2013-05-20 06:48:15 -05:00
Jesse McConnell
4cba93e8d4
Merge branch 'jetty-7' into release-7
2013-05-20 06:47:08 -05:00
Jan Bartel
6cfd33a71b
397051 Make JDBCLoginService data members protected to facilitate subclassing
2013-05-20 18:27:24 +10:00
Jan Bartel
8ceb61992b
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2013-05-20 17:32:18 +10:00
Jan Bartel
b5f3743a22
Uncomment test for changes to MultipartInputStreamParser
2013-05-20 17:20:52 +10:00
Jan Bartel
259aac6463
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-05-20 17:18:28 +10:00