705 Commits

Author SHA1 Message Date
Simone Bordet
0ed7d30741 Fixed timeout value left over during debugging. 2014-04-08 13:58:21 +02:00
Joakim Erdfelt
5ca59f6087 Fixing up test expectations based on reworked module setup for spdy + npn 2014-04-07 09:48:34 -07:00
Simone Bordet
2897027f53 Merged branch 'master' into 'jetty-9.2.x'. 2014-04-07 17:51:23 +02:00
Simone Bordet
cc0775133e 432145 - Pending request is not failed when HttpClient is stopped.
Fixed by fixing the code in close() to also abort pending exchanges.
Reviewed for HTTP, FastCGI and SPDY transports.
2014-04-07 17:39:29 +02:00
Greg Wilkins
6edb854c69 Merge remote-tracking branch 'origin/master' into jetty-9.2.x
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-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-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-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-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-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
2014-04-07 12:59:15 +10:00
Greg Wilkins
64e11bc8e8 reverted version to 9.1.x pending merge of 9.2 branch 2014-04-07 12:52:43 +10:00
Greg Wilkins
303fa57eaf improved protonego module structure to avoid ini files of parameterized modules 2014-04-03 16:50:33 +11:00
Jan Bartel
c62500c63d Fix alpn-related poms for osgi and osgi test cases. 2014-04-03 16:41:24 +11:00
Jesse McConnell
dbb938ac71 [maven-release-plugin] prepare for next development iteration 2014-04-02 10:55:29 -05:00
Jesse McConnell
c616ece6c7 [maven-release-plugin] prepare release jetty-9.1.4.v20140401 2014-04-02 10:55:21 -05:00
Joakim Erdfelt
077887141f Updating alpn and npn modules to protonego 2014-04-01 13:09:49 -07:00
Joakim Erdfelt
28d9df1dbb Refactoring alpn stuff into jetty-alpn-server and jetty-alpn-client 2014-03-31 14:18:37 -07:00
Greg Wilkins
c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Joakim Erdfelt
1444ffadb8 Reverting <modules> in parent pom in favor of spdy and osgi specifics 2014-03-26 14:06:23 -07:00
Joakim Erdfelt
4f051fecf3 More work to make alpn & npn builds sane 2014-03-25 15:47:15 -07:00
Joakim Erdfelt
aea74ea2da Attempting to fix OSGi build for Java 8 2014-03-25 09:01:11 -07:00
Simone Bordet
f0fc00ea50 Merged branch 'master' into 'jetty-9-alpn'. 2014-03-21 21:35:26 +01:00
Greg Wilkins
0d1fca545c 424107 Abort HttpTransport if already committed on error 2014-03-21 13:51:30 +11:00
Simone Bordet
52b34020a0 Implemented ALPN client-side connection.
This time added implementation classes :)
2014-03-20 21:28:13 +01:00
Simone Bordet
947e59f2b4 Implemented ALPN client-side connection. 2014-03-20 19:32:25 +01:00
Simone Bordet
3692ac17d4 Merged branch 'master' into 'jetty-9-alpn'. 2014-03-20 16:34:44 +01:00
Simone Bordet
b994db698c Refactored NPN code for the soon-to-arrive ALPN code.
Moved NPN tests to new module spdy-npn-tests, that now is the only module
requiring the -Xbootclasspath configuration for the Maven Surefire Plugin.
2014-03-20 16:22:43 +01:00
Simone Bordet
919e41114c Updated POMs to use ALPN. TestJettyOSGiBootSpdy still not working. 2014-03-20 12:09:54 +01:00
Simone Bordet
d77b07d687 Refactored SPDY modules and added ALPN tests. 2014-03-19 12:57:50 +11:00
Simone Bordet
b3669c499c Refactored SPDY modules to extract into a different module the tests
that required NPN to run.
2014-03-19 12:57:50 +11:00
Simone Bordet
b3b669166f Implemented ALPNServerConnection and refactored common code with NPN. 2014-03-19 12:57:50 +11:00
Greg Wilkins
a85b855921 Revert ALPN and java 8 changes to move to another branch
Reverts e9ecd8c,2f22a10,addc49f,f4e4b09,cf1c245
Disabled unit test from commit 47e7583
2014-03-19 12:54:04 +11:00
Simone Bordet
2f22a1066c Refactored SPDY modules and added ALPN tests. 2014-03-18 23:59:19 +01:00
Simone Bordet
f4e4b093d4 Refactored SPDY modules to extract into a different module the tests
that required NPN to run.
2014-03-18 23:59:18 +01:00
Simone Bordet
cf1c2451d6 Implemented ALPNServerConnection and refactored common code with NPN. 2014-03-18 23:59:18 +01:00
Simone Bordet
2b59cd305d Removed section to enforce usage of JDK 7 (it's implicit in Jetty 9). 2014-03-13 16:30:35 +01:00
Jesse McConnell
0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell
1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Simone Bordet
34aa88472a 428266 - HttpRequest mangles URI query string.
Now raw query string is preserved.
2014-02-21 17:55:19 +01:00
Jesse McConnell
eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell
f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell
8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Jesse McConnell
2db90757ed Bug 426481 fix < java 1.7.0_10 npn files 2014-01-23 10:36:29 -06:00
Simone Bordet
e4cac732cf Updated build profiles to JDK 7u51, along with NPN modules. 2014-01-14 22:51:18 +01:00
Simone Bordet
1286363dbf Improved SPDY load test. 2014-01-14 22:51:18 +01:00
Simone Bordet
9f786402fd Added TODO, reminding to notify failure outside sync blocks. 2014-01-14 22:51:18 +01:00
Simone Bordet
c06e65e798 Improved dump() output. 2014-01-14 22:51:18 +01:00
Jesse McConnell
b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell
b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt
0d3b840951 Setting problematic SPDY test to @Ignore till such time as it can be properly addressed 2014-01-08 11:35:06 -07:00
Simone Bordet
152dfaa293 Restoring code removed by mistake. 2014-01-08 16:49:04 +01:00
Simone Bordet
dbee351543 425043 - Track whether pools are used correctly.
Added leak detection to SPDY load test.
2014-01-08 16:17:32 +01:00
Joakim Erdfelt
7af87b4a04 424598 - Module [npn] downloads wrong npn jar
+ Separating Module logical name from file system reference name
+ [depend] references in *.mod files are tried as file system reference
  names, then logical names.
+ --module=<name> are tried only as logical names.
+ All of the npn/npn-${jvm.version}.mod files are defined as logical
  name of npn-boot
2014-01-06 11:16:03 -07:00
Joakim Erdfelt
658c2ce762 424598 - Module [npn] downloads wrong npn jar
+ Adding testcase to validate all of the npn-boot sub-modules for sanity
2014-01-06 11:16:03 -07:00
Simone Bordet
e94ff7db9c 424743 - Verify abort behavior in case the total timeout expires
before the connect timeout.

The changes to fix this issue uncovered problems in the HttpSender
state machine.
In particular, the SenderState is now defining more states that
depend on deferred content, and on handling of 100 Continue responses.

The refactoring also highlighted the fact that there was no need to
keep HttpConversation objects in a Map in HttpClient: they are now
only referenced by the HttpRequest.
With this change, Request.getConversationID() has been deprecated.

Also fixed a number of tests to make them more reliable.
2014-01-05 15:29:43 +01:00