7454 Commits

Author SHA1 Message Date
Joakim Erdfelt
33c11dffaa JSR-356 - cleaning up Decoder and Encoder lifecycle. 2013-07-09 14:16:06 -07:00
Joakim Erdfelt
46e9493c85 JSR-356 - reworked Config to maintain user provided config
+ If a user provided config is supplied, then that config should
  be used for init(EndpointConfig) and other various accesses to
  the configuration object.  This refactor stops using an internal
  EndpointConfig object always and moves the internal config
  fields into the JsrSession object instead.
2013-07-09 14:16:06 -07:00
Greg Wilkins
e35914e400 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2013-07-09 00:32:41 +10:00
Greg Wilkins
809c3aa472 412442 Avoid connection timeout after FIN-FIN close 2013-07-08 23:23:40 +10:00
Greg Wilkins
70b285eabd 398467 Servlet 3.1 Non Blocking IO
fixed some tests
2013-07-08 14:59:08 +10:00
Greg Wilkins
2d3f0bfe0b 412466 Improved search for unset JETTY_HOME 2013-07-08 14:27:13 +10:00
Greg Wilkins
83b55418f5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-07-08 13:58:35 +10:00
Greg Wilkins
4a49a5e3f0 398467 Servlet 3.1 Non Blocking IO
Handle bad listeners
2013-07-08 13:08:53 +10:00
Greg Wilkins
5ddaf9acbf 398467 Servlet 3.1 Non Blocking IO
Make sure that onAllDataRead is correctly dispatched
2013-07-08 13:00:03 +10:00
Thomas Becker
81e92fcc13 409845 add test that makes sure that DataFrameGenerator correctly prepends the header information 2013-07-05 16:11:29 +02:00
Thomas Becker
2d911612a0 412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED 2013-07-05 12:02:52 +02:00
Thomas Becker
5d1225b60e Revert "Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED""
This reverts commit 474d9fec28917bcae9cb9cfdc504aa54243a9b50.
2013-07-05 10:42:43 +02:00
Greg Wilkins
981102fda5 398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins
474d9fec28 Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
This reverts commit cb2eb030d18b6c92f3249794c02b100f0ee5cb33.
2013-07-05 09:21:10 +10:00
Thomas Becker
cb2eb030d1 412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED 2013-07-04 15:46:14 +02:00
Greg Wilkins
965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Greg Wilkins
bce8eaabe0 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
2013-07-04 17:28:22 +10:00
Greg Wilkins
606c042691 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-04 15:52:39 +10:00
Greg Wilkins
cb0084260f 411216 RequestLogHandler handles async completion 2013-07-04 15:22:56 +10:00
Greg Wilkins
89ce13c191 Merge remote-tracking branch 'origin/jetty-8' 2013-07-04 15:01:11 +10:00
Greg Wilkins
c33db24d94 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
Greg Wilkins
37de67d3d7 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-04 14:59:55 +10:00
Greg Wilkins
49f865c45a commented out incomplete test for EOF content 2013-07-04 14:59:22 +10:00
Greg Wilkins
8d455056ec Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 14:40:45 +10:00
Greg Wilkins
7ad4d80af2 411216 RequestLogHandler handles async completion 2013-07-04 14:32:47 +10:00
Jan Bartel
8aac3eef48 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-07-04 11:15:39 +10:00
Jan Bartel
091a419568 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 11:11:44 +10:00
Jan Bartel
1762ab7de5 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2013-07-04 10:58:28 +10:00
Jan Bartel
c934bbe45c 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 10:22:22 +10:00
Thomas Becker
f8049caf3d 412234 fix bug where NetworkTrafficSelectChannelEndpoint counted bytes wrong on incomplete writes 2013-07-03 18:13:07 +02:00
Thomas Becker
a85711420d 409282 fix intermittently failing MaxConcurrentStreamTest 2013-07-03 17:12:13 +02:00
Thomas Becker
e4c7cfbf37 408235 SPDYtoHTTP proxy fix: remove hop headers from upstream server 2013-07-03 15:21:06 +02:00
Thomas Becker
85ef539663 HttpTransportOverSPDY add newline 2013-07-02 08:48:11 +02:00
Thomas Becker
8b31188ca7 405424 add X-Powered-By and Server header to SPDY 2013-07-01 21:57:22 +02:00
Thomas Becker
260b21f7df 405424 add X-Powered-By and Server header to SPDY 2013-07-01 17:08:35 +02:00
Thomas Becker
d2470f6170 410805 StandardSession: remove all frameBytes for a given stream from queue if the stream is reset 2013-07-01 11:35:13 +02:00
Joakim Erdfelt
aa1aae182a Instituting Content-Length OR Transfer-Encoding check in GzipFilter tests
+ Tests currently fail, will let greg look deeply into jetty's eyes to
  determine why it defiantly doesn't want to cooperate with greg.
2013-06-30 16:37:08 -07:00
Jesse McConnell
f262dce23b add test for gzip streaming and flushing write 2013-06-28 15:39:12 -05:00
Jesse McConnell
c089335f51 add test for gzip streaming and flushing write 2013-06-28 14:58:55 -05:00
Joakim Erdfelt
d522bb4c19 Merge branch 'jetty-8' 2013-06-28 10:21:42 -07:00
Joakim Erdfelt
568bb3db0d Merge branch 'jetty-7' into jetty-8 2013-06-28 10:21:17 -07:00
Joakim Erdfelt
162cbc1416 411909 - GzipFilter flushbuffer() results in erroneous finish() call
+ Bad finish() call changed to more appropriate flush() call
2013-06-28 10:20:20 -07:00
Joakim Erdfelt
9b3134eccd Fixing pom parent version 2013-06-27 09:53:29 -07:00
Joakim Erdfelt
0cf6977a35 JSR-356 - fixing reflected detection of interface generic class type.
+ Used by Decoders, Encoders, and MessageHandlers
2013-06-27 09:28:02 -07:00
Greg Wilkins
32ec8255db 411538 Use Replacement character for bad parameter % encodings 2013-06-27 10:19:51 +10:00
Greg Wilkins
e4716e05e1 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	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/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-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-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
	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-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-06-27 09:12:28 +10:00
Joakim Erdfelt
d857562059 Merge branch 'release-9' 2013-06-25 16:37:05 -07:00
Joakim Erdfelt
bf3e6a4a53 Updating VERSION.txt top section 2013-06-25 16:35:16 -07:00
Joakim Erdfelt
e1d6329b02 Cherry picking GoAwayTest fix 2013-06-25 09:14:31 -07:00
Thomas Becker
67fd1e496f 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway 2013-06-25 09:13:34 -07:00