790678d460
Moved NPN module files in the right directory after merge.
2014-08-21 12:27:58 +02:00
a1ea9af3f9
Merged branch 'master' into 'jetty-http2'.
2014-08-21 12:20:08 +02:00
6e58e3b00e
Properly updated NPN and ALPN files and configuration for JDK 7u65
...
and 8u20.
2014-08-21 12:19:23 +02:00
8e62a50500
442086 - Review HttpOutput blocking writes.
...
Reviewed blocking writes call sites and handled exceptions in the same
way for all of them, calling HttpChannel.abort(Throwable).
Modified HttpChannel.abort() to take the failure as parameter, so that
subclasses may inspect the failure and decide what to do.
2014-08-19 18:37:53 +02:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
814c84a212
Introduced configuration properties for ALPN/NPN advertised protocols.
...
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:
alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1
in start.ini (in the example above for http2).
2014-08-12 18:54:33 +02:00
d2fa4dca60
Introduced configuration properties for ALPN/NPN advertised protocols.
...
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised.
Instead, simply specify:
protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1
in start.ini (in the example above for http2).
2014-08-11 23:59:26 +02:00
d26a003d4c
Removed configuration for SPDY/2.
2014-08-11 23:46:00 +02:00
6dfa452e29
case insensitive protocols
2014-08-07 19:00:31 +10:00
287e86b7aa
decomposed https,http2 and spdy modules to share ServerConnector
2014-08-07 12:58:12 +10:00
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
70dafa8eb3
simplified HttpTransport API
2014-07-31 11:53:51 +10:00
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
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
examples/quickstart/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-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-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-dispatch-webapp/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-07-25 17:37:53 +10:00
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
22e57ef7b7
refactored Request to use new HttpURI
2014-07-25 15:03:51 +10:00
30123607c6
Major refactor of metadata and HttpURI
...
This refactor strives to remove duplication between the Metadata class and the HttpURI class.
Both classes have been made mutable (as they partially were anyway so best not to pretend).
HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).
Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
67e788bc58
Replaced usage of Continuation with AsyncContext.
2014-07-23 14:56:31 +02:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
a7e87c5eed
Updated NPN and ALPN to JDK 7u65 and 8u11.
2014-07-17 11:48:19 +02:00
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
78b03c5b8e
More debug for intermittent failures
2014-07-02 16:01:00 +10:00
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
f2f19ee3ba
Improved changes introduced by a746d78.
2014-06-26 10:08:13 +02:00
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
2b494fde0e
Miscellaneous refactorings.
2014-06-17 16:23:06 +02:00
aafed92305
Updated SPDY code to HttpChannel refactorings.
2014-06-17 10:53:20 +02:00
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
adaeeefe32
Merged branch 'master' into 'jetty-http2'.
2014-06-16 16:08:40 +02:00
7613385578
Moved NPN[Client|Server]Connection[Factory] classes to their own
...
modules, akin for the ALPN classes, and refactored all code that was
referencing them.
2014-06-16 12:46:26 +02:00
424e421439
Added JDK 7u60 files and configuration for NPN and ALPN.
2014-06-11 18:45:45 +02:00
330d8f9ea9
Added JDK 7u60 files for NPN and ALPN.
2014-06-11 18:44:54 +02:00
bbd61f8e19
Multiple mixed in changes and improvements
...
Simplified HttpParser as per rfc7230
implemented local/remote hpack max table sizes
2014-06-11 15:16:40 +02:00
94164b8fb2
Add jetty-maven-plugin <excludedGoals> for spdy test webapp as only run-forked will work
2014-06-10 16:28:45 +02:00
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
b2296cc2d4
simplified startRequest
2014-06-09 14:12:46 +02:00
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
bbab2e7832
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
...
+ Switching out support for ":" to "|"
2014-06-03 17:09:48 -07:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
3bee85423c
435088 - lib/npn packaging of jetty-distribution is off
...
+ Fixing contents of npn-1.7.0_55.mod to conform to Jetty 9 techniques.
2014-05-20 10:10:16 -07:00
7918a58c71
Using Callback.Adapter.INSTANCE to avoid unneeded allocations.
2014-05-19 18:49:17 +02:00
ea990e4450
435088 - lib/npn packaging of jetty-distribution is off
...
+ correcting old directory name from merge of jetty-9.1.x -> master
see commit - 60f2200184
2014-05-16 10:05:01 -07:00
6a3cab2a2f
[maven-release-plugin] prepare for next development iteration
2014-05-15 14:44:37 -05:00
eec01cbff4
[maven-release-plugin] prepare release jetty-9.2.0.RC0
2014-05-15 14:44:28 -05:00
4d2fdee7fc
[maven-release-plugin] prepare for next development iteration
2014-05-08 11:44:34 -05:00
4515fe661b
[maven-release-plugin] prepare release jetty-9.2.0.M1
2014-05-08 11:44:27 -05:00
cdb38c4532
Merge branch 'master' into release-9
2014-05-08 11:12:36 -05:00
0abda0f35a
434074 Avoid double dispatch by returning false from messageComplete
2014-05-05 19:49:58 +02:00
43454ebd0a
Merged branch 'master' into '431642'.
2014-04-30 15:34:54 +02:00
2e261b75d6
433692 improved buffer resizing
2014-04-29 20:36:13 +02:00
aeb27cd461
431642 - Implement ProxyServlet using Servlet 3.1 async I/O.
...
Intermediate commit that implements asynchronous content in HttpClient,
for the HTTP protocol, passing the tests.
This work needs to be extended to FCGI and SPDY and finally implement
the asynchronous proxy servlet.
2014-04-19 12:36:15 +02:00
42d98ebb61
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-17 16:24:16 +02:00
2a177f2206
Added URL for new NPN version.
2014-04-17 16:23:52 +02:00
60f2200184
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-16 11:10:18 +02:00
40c82a99ab
Added profile in the main pom.xml to build with JDK 7u55.
...
Added new NPN module files for JDK 7u55, referencing the new NPN version required by JDK 7u55.
2014-04-16 11:06:50 +02:00
7cd3f9983f
Compile fix
2014-04-11 16:03:49 -07:00
8e24cdf913
Fixed timeout value left over during debugging.
2014-04-10 09:03:46 +02:00
e3662a9b23
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-10 08:59:30 +02:00
0e458c80f4
reverted version to SNAPSHOT
2014-04-10 16:37:25 +10:00
e1d07f908c
[maven-release-plugin] prepare for next development iteration
2014-04-09 12:26:35 -05:00
fdae77842c
[maven-release-plugin] prepare release jetty-9.2.0.M0
2014-04-09 12:26:29 -05:00
f32e8bd3c0
[maven-release-plugin] prepare for next development iteration
2014-04-09 10:44:51 -05:00
47906076f6
[maven-release-plugin] prepare release jetty-9.2.0.M0
2014-04-09 10:44:41 -05:00
0ed7d30741
Fixed timeout value left over during debugging.
2014-04-08 13:58:21 +02:00
5ca59f6087
Fixing up test expectations based on reworked module setup for spdy + npn
2014-04-07 09:48:34 -07:00
2897027f53
Merged branch 'master' into 'jetty-9.2.x'.
2014-04-07 17:51:23 +02:00
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
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
64e11bc8e8
reverted version to 9.1.x pending merge of 9.2 branch
2014-04-07 12:52:43 +10:00
303fa57eaf
improved protonego module structure to avoid ini files of parameterized modules
2014-04-03 16:50:33 +11:00
c62500c63d
Fix alpn-related poms for osgi and osgi test cases.
2014-04-03 16:41:24 +11:00
dbb938ac71
[maven-release-plugin] prepare for next development iteration
2014-04-02 10:55:29 -05:00
c616ece6c7
[maven-release-plugin] prepare release jetty-9.1.4.v20140401
2014-04-02 10:55:21 -05:00
077887141f
Updating alpn and npn modules to protonego
2014-04-01 13:09:49 -07:00
28d9df1dbb
Refactoring alpn stuff into jetty-alpn-server and jetty-alpn-client
2014-03-31 14:18:37 -07:00
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
1444ffadb8
Reverting <modules> in parent pom in favor of spdy and osgi specifics
2014-03-26 14:06:23 -07:00
4f051fecf3
More work to make alpn & npn builds sane
2014-03-25 15:47:15 -07:00
aea74ea2da
Attempting to fix OSGi build for Java 8
2014-03-25 09:01:11 -07:00
f0fc00ea50
Merged branch 'master' into 'jetty-9-alpn'.
2014-03-21 21:35:26 +01:00
0d1fca545c
424107 Abort HttpTransport if already committed on error
2014-03-21 13:51:30 +11:00
52b34020a0
Implemented ALPN client-side connection.
...
This time added implementation classes :)
2014-03-20 21:28:13 +01:00
947e59f2b4
Implemented ALPN client-side connection.
2014-03-20 19:32:25 +01:00
3692ac17d4
Merged branch 'master' into 'jetty-9-alpn'.
2014-03-20 16:34:44 +01:00
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
Greg Wilkins
Joakim Erdfelt
Jan Bartel
Jesse McConnell