Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Greg Wilkins
e3bda4efbe
446564 Refactored RequestLog Mechanism
...
RequestLog can now be set on the HttpChannel and is called during the onCommitted callback.
The RequestLog may be set either on the server or via an updated RequestLogHandler that can
be applied to a specific context.
2014-10-31 13:31:29 +11:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Greg Wilkins
171f7b5352
improved protocol info log
2014-10-30 17:48:24 +11:00
Greg Wilkins
71d1c434e4
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-30 16:58:55 +11:00
Greg Wilkins
2332b4f734
449175 Removed extra space in NCSA log
2014-10-30 16:42:31 +11:00
Greg Wilkins
4b0193247b
448841 Clarified selectors==0 javadoc
...
448840 Clarified ServerConnector javadoc
448839 Fixed javadoc typo in ServerConnector
2014-10-30 15:50:54 +11:00
Greg Wilkins
a6e00bc642
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Greg Wilkins
414479795e
443550 improved FileResource encoded alias checking
...
removed extra debug
2014-10-30 14:29:00 +11:00
Greg Wilkins
8eab088a35
443550 improved FileResource encoded alias checking
2014-10-30 14:12:43 +11:00
Greg Wilkins
9189c934d9
444722 Fixed order of setReuseAddress call
2014-10-30 11:28:45 +11:00
Joakim Erdfelt
8899f6d360
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt
b132b90b03
Simplifying warning message
2014-10-29 15:49:23 -07:00
Joakim Erdfelt
733cc71791
Reworking jetty.home warning to be a module instead.
...
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Joakim Erdfelt
607a560ebd
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-28 09:36:34 -07:00
Simone Bordet
8d2acb6817
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-28 11:55:44 +01:00
Simone Bordet
7cdcd69f44
Reverted version to 9.2.4-SNAPSHOT.
2014-10-28 11:52:00 +01:00
Jesse McConnell
3b745f06df
[maven-release-plugin] prepare for next development iteration
2014-10-27 16:16:24 -05:00
Jesse McConnell
4f0d78c91b
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
2014-10-27 16:16:18 -05:00
Jesse McConnell
d17613982b
[448761] ContextHandler returns incorrect servlet minor version
2014-10-27 15:43:30 -05:00
Joakim Erdfelt
6ff43a0af1
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-27 13:42:30 -07:00
Greg Wilkins
e19178fd82
fixed bad merge
2014-10-26 20:34:19 +11:00
Greg Wilkins
fbc131b46e
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-10-26 17:40:16 +11:00
Greg Wilkins
34a8da2ba2
445823 Moved RequestLog calling to HttpChannel
...
Simplified the RequestLogHandler. It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel. The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection. It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
2014-10-26 17:30:50 +11:00
Simone Bordet
d13cdf2592
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-24 14:06:54 +02:00
Simone Bordet
c66963126f
446563 - Null HttpChannel.getCurrentHttpChannel() in ServletHandler.doFilter().
...
Moved the finally block that resets the current HttpChannel and the
thread name after the handling of the COMPLETE action.
This is necessary because AsyncListener.onComplete() (triggered by
the handling of the COMPLETE action) may perform a
RequestDispatcher.forward() that requires the current HttpChannel
thread local to be set.
2014-10-24 14:03:06 +02:00
Greg Wilkins
4323e450c5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-10-24 15:52:28 +11:00
Greg Wilkins
31e448ffd6
Removed duplication of HttpGenerator$Info vs http.MetaData
...
Use MetaData throughout code base
2014-10-24 15:51:20 +11:00
Jesse McConnell
2da2897c37
add logs/ directory as require directory for base
2014-10-23 20:20:42 -05:00
Greg Wilkins
98a07789ce
447515 Remove GzipFilter
...
Improved javadoc and comments
2014-10-24 11:05:19 +11:00
Greg Wilkins
67e686c108
447515 Remove GzipFilter
...
Added a module to apply GzipHandler to the entire server
2014-10-24 10:48:33 +11:00
Greg Wilkins
ac1b111d57
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-10-24 08:46:12 +11:00
Greg Wilkins
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Jan Bartel
01a1fc166e
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-23 11:20:44 +11:00
Greg Wilkins
627ba945f1
Added AsyncDelayHandler example
2014-10-23 09:11:27 +11:00
Greg Wilkins
29a9f4f693
448156 Fixed INACTIVE race in IteratingCallback
...
Fixed double usage of callback
2014-10-22 16:14:51 +11:00
Greg Wilkins
062a5c4113
447515 Remove GzipFilter
...
misc cleanups in preparation for removal
2014-10-17 15:52:11 +11:00
Greg Wilkins
ba7f7589cb
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-17 14:31:22 +11:00
Greg Wilkins
a906aaa266
Simplified SelectorManager state machine
...
Made the SelectorManager use the CaS state machine for both locking and controlling
the mode of handling changes.
Replaced the concurrent change queue with a pair of array lists that are switched while the lock state is held
2014-10-17 14:16:48 +11:00
Greg Wilkins
dc33bb84a4
447472 test harness for slow large writes
2014-10-17 11:04:23 +11:00
Greg Wilkins
aad1f9d058
447515 Remove GzipFilter
...
Made GzipHandler the same as AsyncGzipFilter
Added a HttpOutput.Interceptor
2014-10-16 20:50:11 +11:00
Greg Wilkins
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
Joakim Erdfelt
dec984302a
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
2014-10-10 16:14:06 -07:00
Joakim Erdfelt
e7b86b99cb
445823 - RequestLogHandler at end of HandlerCollection doesn't work
...
+ Adding more varieties of server side collection vs wrapper with error
handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
context, when also using the mapped error handler
2014-10-10 11:21:40 -07:00
Jan Bartel
e292b572f1
446425 Oracle Sql error on JettySessions table when this table do not exist already
2014-10-10 17:36:36 +11:00
Greg Wilkins
bb2d77f00b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-10 14:20:30 +11:00
Greg Wilkins
6a0e220b9c
446506 getAsyncContext ISE before startAsync on async dispatches
2014-10-10 14:19:42 +11:00
Greg Wilkins
cd15bb187d
446559 Avoid spin consuming extra data
2014-10-10 13:16:41 +11:00
Jan Bartel
f07387c703
442942 Content sent with status 204 (No Content)
2014-10-10 12:58:45 +11:00
Greg Wilkins
0df54fd279
fixed merge
2014-10-10 09:17:48 +11:00
Joakim Erdfelt
17aa2eaf7a
Adding note about weld requirement on .getServerInfo()
2014-10-09 15:11:07 -07:00
Greg Wilkins
7e68a98dcd
fixes from merge
2014-10-10 08:54:11 +11:00
Greg Wilkins
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt
086bea097d
Using StandardCharset where appropriate
2014-10-08 11:02:13 -07:00
Joakim Erdfelt
61dd2c9620
Fixing encoding tests (that actually didn't validate results)
2014-10-02 15:12:32 -07:00
Joakim Erdfelt
43d2c59394
445821 - Error 400 should be logged with RequestLog
...
+ Adding BadRequestLogHandlerTest to demonstrate error 400 not being
captured by RequestLogHandler
2014-10-02 13:55:14 -07:00
Joakim Erdfelt
e93e024166
445823 - RequestLogHandler at end of HandlerCollection doesn't work
...
+ Adding example of RequestLogHandler use in HandlerCollection
2014-10-02 13:54:22 -07:00
Joakim Erdfelt
3636bd6894
Moving hardcoded ports to ephemeral range suitable for more environments
2014-10-02 10:31:32 -07:00
Jan Bartel
149ee01047
445157 First redeployed servlet leaks WebAppContext
2014-10-01 13:03:39 +10:00
Joakim Erdfelt
d0fa66ddf0
445542 - Add SecuredRedirectHandler for embedded jetty use to redirect to secure port/scheme
...
+ Adding SecuredRedirectHandler as option for those jetty embedded folks
to have a simple http -> https solution (can even be setup and bound
to specific connectors via the named virtualhosts concepts)
2014-09-30 12:54:42 -07:00
Simone Bordet
8d2efaf7eb
445167 - Allow configuration of dispatch after select.
...
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.
For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
Simone Bordet
a8b461fe91
Cosmetics: removed unused imports, cleaned up source code, improved javadocs.
2014-09-26 10:13:16 +02:00
Simone Bordet
a9dcfd5c5a
Removed rotten comment and cleaned up javadocs.
2014-09-26 10:13:15 +02:00
Simone Bordet
54cd00aec3
Javadocs cleanup.
2014-09-26 10:13:15 +02:00
Jan Bartel
cc43b9c2c6
444547 Format exception in ResourceCache.Content.toString()
2014-09-23 11:33:44 +02:00
Greg Wilkins
fc4bfc8a66
improved debug logging
2014-09-21 15:03:54 +10:00
Greg Wilkins
bfe83c765e
444485 - Client resets stream, pending server data is failed, write hangs.
...
renamed terminate to abort
2014-09-19 13:03:41 +10:00
Jan Bartel
059f5e2396
444547 Format exception in ResourceCache.Content.toString()
2014-09-19 10:28:33 +10:00
Simone Bordet
bfda3620f3
444485 - Client resets stream, pending server data is failed, write hangs.
...
Fixed by ensuring that when a failure happens, either by catching an
exception or by failing a callback, we always call completed() and
abort the channel (via new method terminate()).
2014-09-18 16:31:16 +02:00
Greg Wilkins
c8198d0531
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-09-18 07:03:40 +10:00
Simone Bordet
193eaaf1c3
SelectChannelEndPoint should set the interestOps as requested.
...
Previously, SCEP was skipping the update of the interestOps in case it
was either input or output shutdown.
Now it always set the interestOps as requested and leaves to the
connection decide what interestOps needs to be set.
2014-09-17 17:44:49 +02:00
Greg Wilkins
89d8ffa940
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
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-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-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-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-09-17 21:15:17 +10:00
Greg Wilkins
1e3e3d9de0
do not throw when callback passed
2014-09-17 21:06:12 +10:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Joakim Erdfelt
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
Simone Bordet
15781da755
Fixed spinning loop that called onFillable() in case of closed
...
connection.
2014-09-11 00:33:47 +02:00
Joakim Erdfelt
3e4c9909e0
443652 - Remove dependency on java.lang.management classes
...
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
- Server.java
- Log.java
- AbstractLifeCycle.java
2014-09-10 10:30:26 -07:00
Simone Bordet
d45a5c861c
Introduced factory method to create the SelectorManager instance.
2014-09-10 11:11:12 +02:00
Greg Wilkins
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
Jesse McConnell
88b19abf52
[maven-release-plugin] prepare for next development iteration
2014-09-05 09:19:30 -05:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Greg Wilkins
5b97d652e1
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
Jan Bartel
51715dbcdb
443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler
2014-09-04 11:31:08 +10:00
Greg Wilkins
5be1fb6270
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
Greg Wilkins
c3647f9d9f
443158 Fixed HttpOutput spin
2014-09-03 15:01:10 +10:00
Simone Bordet
ee3ab1f8ea
Merged branch 'master' into 'jetty-http2'.
2014-09-01 11:57:09 +02:00
Simone Bordet
ca2a23c35d
Improved Javadocs and code cleanup.
2014-09-01 11:28:59 +02:00
Greg Wilkins
277ca5c065
fixed merge
2014-08-29 17:54:28 +10:00
Greg Wilkins
a4debf68c4
fixed merge
2014-08-29 16:03:32 +10:00
Greg Wilkins
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
Greg Wilkins
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
Greg Wilkins
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
Greg Wilkins
eee2ba206e
435322 Added a idleTimeout to the SharedBlockerCallback
2014-08-29 11:55:06 +10:00
Greg Wilkins
d8e6331434
442477 Allow Symlink aliases by default
2014-08-27 17:33:27 +10:00
Greg Wilkins
adb56b3d90
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-27 12:53:54 +10:00
Greg Wilkins
1a0eb64a1f
442383 Improved insufficient threads message
2014-08-27 12:40:54 +10:00
Greg Wilkins
9a52d92f03
442048 fixed sendRedirect %2F encoding
2014-08-27 12:34:15 +10:00
Greg Wilkins
e5c1d66916
avoid default port in http2 push
2014-08-22 16:25:20 +10:00
Greg Wilkins
984c7fdd85
various updates
2014-08-20 17:54:01 +10:00
Greg Wilkins
9b36f999d1
fixed merge
2014-08-20 12:22:16 +10:00
Greg Wilkins
ae8e7f0067
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-20 12:02:09 +10:00
Greg Wilkins
caaa7c508c
440255 ensure 500 is logged on thrown Errors
2014-08-20 11:36:58 +10:00
Greg Wilkins
e15a87f499
440255 ensure 500 is logged on thrown Errors
2014-08-20 10:27:27 +10:00
Simone Bordet
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
Greg Wilkins
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
Greg Wilkins
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
Simone Bordet
a2360bd542
Fixed creation of HttpURI for push requests.
2014-08-14 23:00:21 +02:00
Greg Wilkins
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
Greg Wilkins
98b654ba20
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Greg Wilkins
2af613a28b
improved debugging output
2014-08-13 15:56:02 +10:00
Simone Bordet
14dc4fade0
Updated log statements to use debug() instead of info().
2014-08-12 22:32:17 +02:00
Simone Bordet
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
Simone Bordet
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
Greg Wilkins
5da39140df
remove old TODOs
2014-08-08 18:30:56 +10:00
Greg Wilkins
4d7ead76ce
basic push cache filter
2014-08-08 17:01:05 +10:00
Greg Wilkins
6dfa452e29
case insensitive protocols
2014-08-07 19:00:31 +10:00
Greg Wilkins
55aa2a07b4
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-07 15:29:12 +10:00
Greg Wilkins
1d5998f02e
441073 isEarlyEOF on HttpInput
2014-08-07 15:05:22 +10:00
Greg Wilkins
287e86b7aa
decomposed https,http2 and spdy modules to share ServerConnector
2014-08-07 12:58:12 +10:00
Greg Wilkins
a4d4b3ab57
fix work around classloaders for field preencoders
2014-08-07 09:22:22 +10:00
Greg Wilkins
17f46665df
preencoded httpfield optimisation
2014-08-06 21:09:26 +10:00
Greg Wilkins
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
Greg Wilkins
bec34b460f
optimised HttpFields
2014-08-05 17:26:27 +10:00
Greg Wilkins
6b3c8d06a9
partial 100 continues support in http2
2014-08-05 16:14:53 +10:00
Greg Wilkins
aaa2e5c6c1
refined PathResource alias handling
2014-08-02 12:58:24 +10:00
Simone Bordet
161bccda22
Merged branch 'master' into 'jetty-http2'.
2014-08-01 14:02:53 +02:00
Jan Bartel
75c92bf76a
438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal
2014-08-01 12:44:30 +10:00
Greg Wilkins
fa9b60c77e
Merge remote-tracking branch 'origin/jetty-http2' into pathresource
2014-08-01 10:17:42 +10:00
Greg Wilkins
78165ce5ff
fixed merge
2014-08-01 09:51:57 +10:00
Greg Wilkins
b439549793
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins
785c45d899
Merge remote-tracking branch 'origin/master' into pathresource
2014-08-01 09:49:59 +10:00
Greg Wilkins
f970ffc0ac
Misc cleanups done whilst fixing 435322
2014-08-01 09:02:44 +10:00
Greg Wilkins
252933891c
Merge branch 'master' into pathresource
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
Greg Wilkins
70dafa8eb3
simplified HttpTransport API
2014-07-31 11:53:51 +10:00
Greg Wilkins
5d8780cb4e
Record some TODOs
2014-07-28 15:27:40 +10:00
Greg Wilkins
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
Greg Wilkins
22e57ef7b7
refactored Request to use new HttpURI
2014-07-25 15:03:51 +10:00
Greg Wilkins
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
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Greg Wilkins
2f41275b0f
fixed merge syntax errors
2014-07-23 16:57:36 +10:00
Greg Wilkins
192e8e8ed1
expanded tabs in indents
2014-07-23 16:54:05 +10:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Greg Wilkins
ecb3ab7e5b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-07-23 16:38:15 +10:00
Greg Wilkins
e199b671bb
440020 Abort bad proxy responses with sendError(-1)
2014-07-23 16:31:19 +10:00
Greg Wilkins
564ffca5dc
440114 ContextHandlerCollection does not skip context wrappers
2014-07-23 15:23:35 +10:00
Simone Bordet
467773dbdf
Merged branch 'master' into 'jetty-http2'.
2014-07-22 21:14:46 +02:00
Simone Bordet
4daba1ba79
Restored IteratingCallback APIs (in particular the completed()
...
method) to keep compatibility over micro versions of Jetty.
Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.
Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
Simone Bordet
cae4204150
440020 - ProxyServlet does not handle correctly failure after committed response to client.
...
Fixed by introducing a request attribute "org.eclipse.jetty.server
.Response.failure" used by HttpChannel to immediately close the
connection when it sees it.
2014-07-21 16:48:21 +02:00
Greg Wilkins
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
Greg Wilkins
35ca372e30
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-19 18:56:15 +10:00
Greg Wilkins
c72649e150
435653 encode async dispatched requestURI
2014-07-19 18:55:02 +10:00
Greg Wilkins
fb2a67c0f9
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-19 00:49:37 +10:00
Greg Wilkins
b38a978eac
439067 Improved graceful stop timeout handling
2014-07-19 00:46:55 +10:00
Greg Wilkins
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
Greg Wilkins
30fcce1cdc
434536 Improved Customizer javadoc
2014-07-18 12:18:29 +10:00
Greg Wilkins
a89419fd3f
434536 Improved Customizer javadoc
2014-07-17 16:09:42 +10:00
Greg Wilkins
a2a333ba53
435653 encode async dispatched requestURI
2014-07-17 15:51:22 +10:00
Greg Wilkins
2d52280179
436987 limited range of default acceptors and selectors
2014-07-17 14:29:58 +10:00
Greg Wilkins
b13be9cfa6
438327 Remove hard coded Allow from OPTIONS *
2014-07-17 13:40:21 +10:00
Greg Wilkins
6bc08000c7
439066 javadoc setStopAtShutdown
2014-07-17 13:29:54 +10:00
Greg Wilkins
94ac37f8c2
439067 Javadoc for graceful server stop
2014-07-17 13:29:54 +10:00
Greg Wilkins
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
Greg Wilkins
3a5e67ce9e
Making ShutdownThread actually stop
2014-07-17 10:50:54 +10:00
Greg Wilkins
591eedcb59
[FindBugs] Include explicit typing whereever possible
...
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins
0c66f3a68e
[FindBugs] Ensure resources are closed/freed properly
...
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins
ec310dca90
Fixes to Hash Sessions for 'Stream Closed' errors
2014-07-17 09:45:12 +10:00
Greg Wilkins
c19a14a4a2
[FindBugs] Ensure proper lazy-initialization even if this costs some performance
2014-07-17 08:35:40 +10:00
Greg Wilkins
6893027ecd
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2014-07-16 17:23:29 +10:00
Greg Wilkins
3bbd1dae59
fixed merge
2014-07-16 16:40:12 +10:00
Greg Wilkins
5f033b48d5
438204 leave IPv6 addresses [] wrapped in getServerName
2014-07-16 16:39:02 +10:00
Greg Wilkins
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
Joakim Erdfelt
dd5cdab54c
439540 - setReuseAddress() in ServerConnector.java is not coded properly
...
+ Adding unit test to confirm existing behavior of
ServerConnector.setReuseAddress(boolean) and ServerConnector.open()
2014-07-15 17:02:51 -07:00
Greg Wilkins
4d2a580c2c
439375 preferred rfc7231 format is mime;charset=lowercase-9
2014-07-11 17:56:08 +10:00
Greg Wilkins
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
Greg Wilkins
2d057bea13
HttpChannelOverHttp uses held values rather than request
2014-07-11 16:09:36 +10:00
Greg Wilkins
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Greg Wilkins
068ec21419
438204 getServerName returns IPv6 addresses wrapped in []
2014-07-09 16:44:34 +10:00
Greg Wilkins
42e1a60d65
438204 getServerName returns IPv6 addresses wrapped in []
2014-07-09 14:38:06 +10:00
Greg Wilkins
ca1a9ceb7c
fixed merge issues
2014-07-04 23:22:40 +10:00
Greg Wilkins
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
Greg Wilkins
0f70f28839
avoid race test failures
2014-07-03 15:10:48 +10:00
Greg Wilkins
78b03c5b8e
More debug for intermittent failures
2014-07-02 16:01:00 +10:00
Greg Wilkins
6eceb6bd99
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-29 08:11:41 +02:00
Greg Wilkins
0751256559
438434 ResourceHandler checks aliases
2014-06-27 21:46:59 +02:00
Greg Wilkins
9b764ef3fa
435322 Fixed Iterating Callback close
2014-06-27 20:43:12 +02:00
Joakim Erdfelt
56751dfa72
Merge branch 'master' into pathresource
2014-06-26 08:56:43 -07:00
Simone Bordet
391b2bb481
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 13:24:33 +02:00
Simone Bordet
17895f8256
438079 - Review garbage creation in 9.2.x series.
2014-06-26 13:16:08 +02:00
Simone Bordet
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
Simone Bordet
299d390dae
Removed unnecessary reset of fields from onCompleteSuccess() and
...
onCompleteFailure().
They are not needed because these are methods that move the
IteratingCallback in a final state, so it won't be used anymore. And
if it is reset(), then those fields are already properly reset there.
2014-06-26 10:48:38 +02:00
Simone Bordet
4af586770e
Cannot throw exceptions from reset(), must fail the callback instead.
2014-06-26 10:46:43 +02:00
Simone Bordet
2e57fb6fad
Removed unnecessary volatile declaration.
...
Calls to reset() are always followed by iterate() that provides a memory barrier by changing its state, which is an AtomicReference.
2014-06-26 10:45:00 +02:00
Joakim Erdfelt
9f844383cd
Making PathResource the default for "file://" resources
...
+ Making ResourceTest a proper @Parameterized test case
+ Moving jar tests out of ResourceTest into JarResourceTest
+ Moving classpath tests out of ResourceTest into ClassPathResourceTest
+ Making more improvements to PathResource to satisfy expecations in
the rest of the codebase.
+ Requests for resource subpaths that use "//" in their strings will
now work correctly (it used to result in null requests in
FileResource)
2014-06-25 14:11:44 -07:00
Greg Wilkins
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
Simone Bordet
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
Simone Bordet
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
Greg Wilkins
f93a409589
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-24 17:33:51 +02:00
Greg Wilkins
28ad689bcb
437996 avoid async status race by not setting 200 on handled
2014-06-24 12:27:03 +02:00
Greg Wilkins
7fa4f1e9f8
cleaned up authority handling
2014-06-17 19:40:09 +02:00
Simone Bordet
2b494fde0e
Miscellaneous refactorings.
2014-06-17 16:23:06 +02:00
Greg Wilkins
85cb290e1c
minor clean ups
2014-06-17 15:39:55 +02:00
Greg Wilkins
0539b48b8a
nicer constructors
2014-06-17 15:28:40 +02:00
Simone Bordet
20c38c2396
Cosmetics.
2014-06-17 10:53:00 +02:00
Greg Wilkins
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
Simone Bordet
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
Simone Bordet
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
Greg Wilkins
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
Greg Wilkins
b38bae36f1
moved http/1.1 isms out of HttpChannel into HttpConnection
2014-06-10 11:28:07 +02:00
Greg Wilkins
5883123d07
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-10 09:01:21 +02:00
Jesse McConnell
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
Jesse McConnell
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
Greg Wilkins
3c321e9b8f
split authority field and hold results in header table
2014-06-09 15:34:09 +02:00
Greg Wilkins
b2296cc2d4
simplified startRequest
2014-06-09 14:12:46 +02:00
Joakim Erdfelt
05575774a1
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
...
+ Switching out support for ":" to "|"
2014-06-04 11:14:35 -07:00
Greg Wilkins
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
Greg Wilkins
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
Joakim Erdfelt
d62f45dbd2
436405 - ${jetty.base}/resources not on classpath with default configuration
...
+ Adding missing '/'
2014-06-02 13:56:54 -07:00
Jan Bartel
b09e7d33e2
436345 Refactor AbstractSession to minimize burden on subclasses to implement behaviour
2014-06-02 15:01:49 +02:00
Jan Bartel
1b00888739
436345 Refactor AbstractSession to ease customization
2014-06-02 11:48:28 +02:00
Jesse McConnell
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
Jesse McConnell
7e71c42bc5
Merge branch 'master' into release-9
2014-05-26 11:36:41 -05:00
Jesse McConnell
5e3e0930e0
Revert "434810 better handling of bad messages"
...
This reverts commit 1e524f378e
.
2014-05-26 11:20:07 -05:00
Jesse McConnell
aa3c9322a6
Revert "434810 better handling of bad messages"
...
This reverts commit 3f4a8abf9e
.
2014-05-26 11:20:00 -05:00
Jesse McConnell
8936b160c2
Merge branch 'master' into release-9
2014-05-26 10:46:39 -05:00
Jesse McConnell
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
Jesse McConnell
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
Greg Wilkins
3f4a8abf9e
434810 better handling of bad messages
2014-05-21 22:01:28 +02:00
Greg Wilkins
1e524f378e
434810 better handling of bad messages
2014-05-21 20:13:21 +02:00
Jan Bartel
58ea1dd386
435412 Make AbstractSession.access() more amenable to customization
2014-05-21 18:43:02 +02:00
Simone Bordet
e4d6768901
434386 - Request Dispatcher extracts args and prevents asyncIO.
...
Changed behavior of mergeQueryParameters() so that new query
parameters hide old query parameters, but they are accumulated for
getParameter() APIs.
2014-05-12 13:08:28 +02:00
Jan Bartel
ca5a086877
434447 Able to create a session after a response.sendRedirect
2014-05-12 11:23:59 +02:00
Simone Bordet
ba4ed86e31
434386 - Request Dispatcher extracts args and prevents asyncIO.
...
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
2014-05-12 10:57:13 +02:00
Greg Wilkins
eecd986058
RequestBuffer handling code and javadoc cleanup
2014-05-07 12:18:33 +02:00
Greg Wilkins
0abda0f35a
434074 Avoid double dispatch by returning false from messageComplete
2014-05-05 19:49:58 +02:00
Jan Bartel
943fb64176
433841 Resource.newResource() declares an exception it does not throw
2014-05-05 15:45:30 +02:00
Greg Wilkins
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
Greg Wilkins
c6f394ab14
434009 Improved javadoc for accessing HttpChannel and HttpConnection
2014-05-05 10:04:15 +02:00
Greg Wilkins
11096e8a0d
Added ASYNC_WOKEN state to HttpChannelState
2014-05-03 10:29:20 +02:00
Joakim Erdfelt
1956ceffde
Setting up junit Assume on OS Alias / Alternate Filename Reference support.
...
+ Windows 8 no longer supports the 8.3 alternate filename reference techniques, rendering the test cases for this behavior no longer valid.
2014-05-03 10:29:20 +02:00
Simone Bordet
976d86b375
434027 - ReadListener.onError() not invoked in case of read failures.
2014-05-02 23:01:33 +02:00