10580 Commits

Author SHA1 Message Date
Greg Wilkins
2d096b677f removed ALPN from test 2015-02-25 18:23:54 +11:00
Greg Wilkins
551b339f67 Added a HttpInput integration test 2015-02-25 16:20:00 +11:00
Greg Wilkins
9b40f6e0dd Added a HttpInput integration test 2015-02-25 15:35:51 +11:00
Greg Wilkins
0ee278902d Added a HttpInput integration test 2015-02-25 15:26:51 +11:00
Joakim Erdfelt
9756ad9fad Merge branch 'jetty-9.2.x' 2015-02-24 17:18:11 -07:00
Joakim Erdfelt
cfca172dd6 Adding credits for discovery 2015-02-24 17:17:50 -07:00
Greg Wilkins
26c4f3ab20 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-02-25 10:48:15 +11:00
Greg Wilkins
f44bf8e368 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
Further refactoring.   Handle the initial onDataAvailable and final onAllDataRead calls
specially, as they may need to be called without scheduling read interest.
2015-02-25 10:47:09 +11:00
Joakim Erdfelt
e5fdf98d19 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/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-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/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-alpn/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-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/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-alpn-tests/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-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/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/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/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-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/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-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
2015-02-24 14:53:54 -07:00
Joakim Erdfelt
1e502d4922 Adding advisory text 2015-02-24 14:43:59 -07:00
Jesse McConnell
1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Jesse McConnell
12031d77af set for release 2015-02-24 10:06:46 -06:00
Jesse McConnell
33b5cc80bb set for release 2015-02-24 10:06:13 -06:00
Simone Bordet
7c315ebce5 Fixed test. 2015-02-24 15:59:32 +01:00
Simone Bordet
6ad90c259c Fixed test. 2015-02-24 14:51:30 +01:00
Simone Bordet
d9255d02d8 Fixed test. 2015-02-24 13:08:21 +01:00
Simone Bordet
72ac0d0a03 Improved logging. 2015-02-24 13:08:06 +01:00
Simone Bordet
c52ba39722 Preventing NPE in case the exchange is failed in the middle of
sending content.
2015-02-24 13:01:11 +01:00
Simone Bordet
1c00cdc7c9 460670 - Support multiple names in <Property> elements. 2015-02-24 10:54:20 +01:00
Joakim Erdfelt
aac427ab8c Fixing compile error 2015-02-23 18:16:30 -07:00
Joakim Erdfelt
a32c9ed79c Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
2015-02-23 18:05:19 -07:00
Joakim Erdfelt
2141cc2dc3 459273 - Redundant license notices
+ Only showing license acknowledgement request screen
  if [FILES] section contains content that does not (yet) exist
2015-02-23 16:49:07 -07:00
Joakim Erdfelt
3e7b5f0fa9 460642 - HttpParser error 400 can expose previous buffer contents in HTTP status reason message
+ Simplifying behavior
2015-02-23 14:57:22 -07:00
Joakim Erdfelt
4df5647f6d 460642 - HttpParser error 400 can expose previous buffer contents in HTTP status reason message 2015-02-23 14:44:53 -07:00
Greg Wilkins
5d6bb9f5d0 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
Additional refactoring to better handle HttpInput state.   Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
Joakim Erdfelt
9b118c9dd2 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-02-20 10:54:34 -07:00
Joakim Erdfelt
22a0cb4a28 Improving HttpField.nameHashCode 2015-02-20 10:54:28 -07:00
Simone Bordet
58ea526b56 Notifying client connection's promise from onOpen().
The client connection's promise was succeeded in the context of a
call to SelectorManager.newConnection().
This was wrong, since succeeding the promise may trigger the send
of a request *before* the connection is actually linked to the
endPoint and opened.

This change moves the succeeding of the client connection's promise
to the connection onOpen() method.
2015-02-20 18:23:31 +01:00
Joakim Erdfelt
08b4bd439e Fixing tests on http2-hpack
+ HttpField.nameHashCode() fixed to actually be US-ASCII case
  insensitive per documentation
+ Since removal of MetaData equals/hashcode, the comparison
  of the MetaData and MetaData.Response is now done entirely
  within the HpackTest
2015-02-20 10:16:03 -07:00
Simone Bordet
f61cfb7016 Fixed construction of MetaData.Request and handling of HttpFields by MetaData. 2015-02-20 16:36:11 +01:00
Simone Bordet
a01d85f0d9 Merged branch 'jetty-9.2.x' into 'master'. 2015-02-20 16:08:18 +01:00
Simone Bordet
2d932fe5c7 Removed hashCode() and equals() and fixed toString().
MetaData instances are mutable, and hashCode() and equals() were
based on those mutable fields; mutable hash codes break hash data
structures, when the object is inserted and then its hash code changes.

Fixed toString() to avoid NPE if _fields is null.
2015-02-20 16:02:54 +01:00
Simone Bordet
71f6527cae Removed extra dispatches from HTTP client code. 2015-02-20 16:02:54 +01:00
Simone Bordet
d4dfc0762f Reviewed and made cosmetic changes. 2015-02-20 16:02:53 +01:00
Simone Bordet
b69b8dfe50 460443 - Race condition releasing the response buffer.
Fixed by making sure that the response buffer is released at the
appropriate times.
2015-02-20 16:00:42 +01:00
Simone Bordet
ddde0db339 Added test to check that a 100 Continue response and a normal response,
when read in a single read by the client, are processed correctly.
2015-02-20 16:00:42 +01:00
Jan Bartel
98a7ad3cf7 460372 if web.xml does not contain jspc maven plugin insertionMarker behavior is wrong 2015-02-20 10:24:56 +11:00
Joakim Erdfelt
7bb3127ee1 Making jetty-start test cases more aligned with real distro configuration 2015-02-19 16:23:40 -07:00
Joakim Erdfelt
d6de16342f Refining testcase 2015-02-19 15:50:47 -07:00
Joakim Erdfelt
9cda55dcca Updating webdefault.xml with distribution specific version 2015-02-19 15:50:16 -07:00
Joakim Erdfelt
bdf5854610 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2015-02-19 15:02:27 -07:00
Joakim Erdfelt
5ecc9b8a36 Adding some tests to prove out inherited lifecycle listener behavior 2015-02-19 14:43:24 -07:00
Joakim Erdfelt
0bbe17186e 460371 - AsyncMiddleManServlet.GZipContentTransformer fails if last transform has no output
+ Making fix simpler, as prior complexity was introduced to satisfy
  different test case dealing with discarded content.
  That test case was improperly testing for no decompressed content.
  Once that assertion was corrected, the ultimate fix is easier.
2015-02-19 14:07:43 -07:00
Joakim Erdfelt
0242c28bd9 460371 - AsyncMiddleManServlet.GZipContentTransformer fails if last transform has no output
+ Ensure that content that has been started to be gzipped is .close()
  properly when the transform finished == true.
  If no content has been gzipped, the .close() and .reset() are not
  called, ever.
2015-02-19 12:17:17 -07:00
Joakim Erdfelt
a0967a935f Setting 9.2.9-SNAPSHOT 2015-02-19 10:21:13 -07:00
Greg Wilkins
b60ea47ef4 Revert "Revert "Fixed AsyncIO double dispatch""
This reverts commit 8bd94ec6be2c597effa3fdcf44c5d3211767e7e8.
This is a revert of the revert to add back in the useful debug, plus some TODO comments describing the problems
2015-02-20 00:18:29 +11:00
Greg Wilkins
8bd94ec6be Revert "Fixed AsyncIO double dispatch"
This reverts commit 968063c1ab64e9d19045c14850d35b137c569894.
2015-02-20 00:03:40 +11:00
Greg Wilkins
968063c1ab Fixed AsyncIO double dispatch 2015-02-19 18:13:31 +11:00
Greg Wilkins
bb8b5f9b76 better toString 2015-02-19 15:39:36 +11:00