Commit Graph

7591 Commits

Author SHA1 Message Date
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 cb2eb030d1.
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
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 57c6199e3b Updating VERSION.txt top section 2013-06-25 08:07:05 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Joakim Erdfelt 1a190a176e Making testcase more consistent 2013-06-25 07:38:26 -07:00
Joakim Erdfelt 1f21c96f6c 411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes
+ Adding continuation in this rare SSL case to allow the remaining bytes
  to be read properly.
2013-06-25 07:38:17 -07:00
Joakim Erdfelt f986493827 Making testcase more consistent 2013-06-24 15:02:40 -07:00
Joakim Erdfelt 40fea41d4f 411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes
+ Adding continuation in this rare SSL case to allow the remaining bytes
  to be read properly.
2013-06-24 14:57:48 -07:00
Thomas Becker c3c9d927b4 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway 2013-06-24 16:20:22 +02:00
Jan Bartel 26b4db5c7d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-24 17:29:03 +10:00
Jan Bartel 7ce05f2c49 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
2013-06-24 17:28:34 +10:00
Greg Wilkins 4d0a796f72 405424 X-Powered-By header 2013-06-24 17:09:44 +10:00
Jan Bartel a7436bc774 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2013-06-24 16:44:45 +10:00