Greg Wilkins
4472b614b9
468747 - XSS vulnerability in HttpSpiContextHandler
2015-05-29 20:12:57 +10:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Simone Bordet
6cabf8452e
468347 - Fix modules/debuglog.mod.
2015-05-26 18:22:22 +02:00
Greg Wilkins
b2e8d2cd04
minor optimisations
2015-05-22 22:53:01 +10:00
Greg Wilkins
4028df12ca
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
2015-05-22 10:50:33 +10:00
Greg Wilkins
68412d1958
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-05-22 10:01:04 +10:00
Greg Wilkins
5bde7f34ea
467936 -w Check HttpOutput aggregateSize is < bufferSize
2015-05-22 09:56:51 +10:00
Greg Wilkins
ff15aa4a5c
Added optional http2 to https for ALPN ordering
2015-05-21 00:38:07 +10:00
Greg Wilkins
3f0fd550dc
467702 - SslContextFactory not backward compatible
2015-05-20 22:20:33 +10:00
Simone Bordet
b844bdde0b
Removed leftover configuration that was forgotten there.
2015-05-20 11:06:44 +02:00
Greg Wilkins
02a1350965
abstracted AbstractHandler setServer
2015-05-20 11:21:55 +10:00
Greg Wilkins
c5e4abd792
467281 Remove Java 1.7 support from Jetty 9.3
2015-05-14 09:31:50 +10:00
Simone Bordet
61f6763a68
Removed example syntax leftovers.
2015-05-12 10:57:04 +02:00
Simone Bordet
1a2eca098a
Fixed XML's <Ref> elements to use refid instead of id.
2015-05-12 08:55:17 +02:00
Jan Bartel
fe0bbe8e2f
Add scavenge interval property to jdbc-sessions.mod
2015-05-08 14:03:16 +10:00
Greg Wilkins
f1f6c67acf
fixed typo
2015-05-08 13:29:39 +10:00
Greg Wilkins
6428718962
457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
...
moved conditional to HttpConfiguration
2015-05-08 09:44:19 +10:00
Jan Bartel
532b0019cc
466678 Make a .mod file for jdbc session management
2015-05-07 17:10:31 +10:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Jan Bartel
e2c7499bae
466628 Improve IllegalStateException on ServletInputStream.setReadListener()
2015-05-07 14:24:08 +10:00
Greg Wilkins
13c7fc3c38
move keystore to test config
2015-05-07 10:35:11 +10:00
Joakim Erdfelt
8ae1de727f
466648 - jetty-ssl download of keystore should be from tags, not master
...
+ Using new ${jetty.tag.version} from start.jar to use
an appropriate tag/branch/master for the download of
the keystore
2015-05-06 16:27:25 -07:00
Greg Wilkins
dd7313ca82
replaced keystore
2015-05-07 08:44:56 +10:00
Greg Wilkins
ad16f0c334
fixed test integration to use example-keystore
2015-05-01 19:32:16 +10:00
Greg Wilkins
29393ace68
moved keystore to example-keystore
2015-05-01 18:23:17 +10:00
Greg Wilkins
2271464406
430951 Support SNI with ExtendedSslContextFactory
...
Made modules do automatic selection of Extended SSL Context if running java 8
2015-05-01 15:50:06 +10:00
Joakim Erdfelt
0443ef7b93
Fixing bad javadoc
2015-04-30 11:02:37 -07:00
Simone Bordet
c04896c9cb
465857 - Support HTTP/2 clear-text server-side upgrade.
...
Added earlier check about the connection being upgraded to avoid
doing more work in the now obsolete connection.
2015-04-30 09:33:24 +02:00
Greg Wilkins
fb958833de
464419 Removed xinetd support
2015-04-30 16:44:23 +10:00
Greg Wilkins
8b39e7ffb8
464629 JDK8 Socket customization
...
Added the SocketCustomizationListener class which may be added as a bean to either a Connector or a ConnectionFactory
so that customizations may be made per connector by connection type or even per connection factory.
SSL is unwrapped.
2015-04-30 11:46:10 +10:00
Greg Wilkins
d5e868b645
less verbose unit tests
2015-04-30 10:58:01 +10:00
Jan Bartel
e30c05cc2b
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
tests/test-integration/src/test/resources/BIOHttp.xml
tests/test-integration/src/test/resources/BIOHttps.xml
tests/test-integration/src/test/resources/NIOHttp.xml
tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Jan Bartel
25474ff7ab
465700 NullPointerException in ResourceHandler with welcome files
2015-04-30 09:06:01 +10:00
Simone Bordet
a6cc4ff2f5
465857 - Support HTTP/2 clear-text server-side upgrade.
...
Fixed and test both types of upgrade, from HTTP/1.1 via its
upgrade mechanism, and direct HTTP/2.
2015-04-29 22:27:50 +02:00
Simone Bordet
aaaf65bf3c
Code and Javadoc cleanups.
2015-04-29 22:27:50 +02:00
Simone Bordet
8bfb50176b
Fixed XML syntax to create SecureRequestCustomizer.
2015-04-29 09:23:09 +02:00
Simone Bordet
49168077ce
Restored default ports for http and tls to 8080 and 8443 respectively.
2015-04-29 09:16:43 +02:00
Greg Wilkins
0dc394869b
465754 Unchecked PrintWriter errors
...
Removed the old unused UncheckedPrintWriter
Added similar bahaviour to the ResponseWriter class
2015-04-29 14:34:24 +10:00
Greg Wilkins
d5c95a1302
465747 - Jetty is failing to process all HTTP OPTIONS requests.
...
The Server handleOptions method was handling all OPTIONS * requests with a blank 200 response.
This has been fixed so that this method only checks that * URI is only applied to OPTIONS method.
2015-04-29 14:01:20 +10:00
Joakim Erdfelt
084a307ea1
socket.reuse-address on windows doesn't work from ServerConnector
2015-04-28 08:32:20 -07:00
Simone Bordet
aa8ea82b28
Cleanup.
2015-04-27 17:21:57 +02:00
Jan Bartel
184c4d4af8
464564 NoSql sessions created inside a forward not persisted correctly
2015-04-23 14:27:11 +10:00
Greg Wilkins
d434f419d2
457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
2015-04-23 11:26:23 +10:00
Greg Wilkins
e633189b48
457788 Powered By in o.e.j.util.Jetty
2015-04-23 11:07:30 +10:00
Greg Wilkins
deec5291f0
460746 HttpConfiguration#setPersistentConnectionsEnabled(boolean)
2015-04-23 10:57:51 +10:00
Joakim Erdfelt
f126d02944
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixing now bad javadoc on RequestLog class
2015-04-22 08:45:57 -07:00
Greg Wilkins
baede130c0
430951 Support SNI with ExtendedSslContextFactory
...
exclude certificates with usages
2015-04-22 17:16:41 +10:00
Greg Wilkins
eee2a53197
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-04-22 16:12:10 +10:00
Jan Bartel
a7bd9d1dd9
464989 AbstractSessionManager.removeEventListener() should remove HttpSessionIdListener
2015-04-22 15:39:35 +10:00
Greg Wilkins
c3577bbbb0
430951 Support SNI with ExtendedSslContextFactory
...
refactored common code in SniX509ExtendedKeyManager
added sniHostCheck code to ensure request host is the same as SNI host
2015-04-22 15:05:56 +10:00
Greg Wilkins
9eb2cb4c0f
446564 Refactored RequestLog Mechanism
...
reverted API
2015-04-22 10:37:39 +10:00
Joakim Erdfelt
5bdfd53e9c
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixing javadoc in jetty-server
2015-04-21 13:58:42 -07:00
Greg Wilkins
2d283edf26
430951 Support SNI with ExtendedSslContextFactory
...
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
Greg Wilkins
53fdbd2ec0
430951 Support SNI with ExtendedSslContextFactory
...
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
Greg Wilkins
12a9c0578e
430951 Support SNI with ExtendedSslContextFactory
...
case insensitive CN
2015-04-20 10:14:40 +10:00
Greg Wilkins
ae31162669
430951 Support SNI with ExtendedSslContextFactory
...
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet
7a75faa770
Fixed default value for requestlog directory.
2015-04-15 18:06:15 +02:00
Simone Bordet
f4a6b4b5eb
460671 - Rationalize property names.
...
Made requestlog use a similar configuration to logging and debugmod modules.
2015-04-14 22:11:59 +02:00
Simone Bordet
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Joakim Erdfelt
dc2221a152
Build under Java 1.8
...
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
Joakim Erdfelt
645ee9223c
Temp revert to make CI happy (but everything else sad)
2015-04-10 06:47:28 -07:00
Joakim Erdfelt
d89aa3a866
Fixing compiler source for modules that now require Java 8
2015-04-09 13:32:30 -07:00
Joakim Erdfelt
60d790cbf8
Marking java8 specifics excluded when compiling with java7
2015-04-08 15:10:53 -07:00
Greg Wilkins
0a943a928c
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-04-02 19:13:00 +11:00
Greg Wilkins
5ed2f84d06
430951 Support SNI with ExtendedSslContextFactory
2015-04-02 19:12:44 +11:00
Jan Bartel
7375ba2cc3
Alpha impl for infinispan session manager.
...
Conflicts:
tests/test-sessions/pom.xml
Conflicts:
tests/test-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
2015-04-02 12:20:12 +11:00
Greg Wilkins
e093041040
enabled delayed dispatch by default
2015-03-26 12:42:09 +11:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Greg Wilkins
5d14d0ca7a
removed extra HttpInput synchronization
2015-03-26 12:18:06 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Greg Wilkins
1d99c0af7b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-25 14:00:23 +11:00
Greg Wilkins
8c652fd5bd
462546 - ShutdownMonitor should bind to jetty.host
...
Added STOP.HOST system property. jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
Greg Wilkins
ad4854dafe
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-19 15:13:15 +11:00
Greg Wilkins
7acbb05060
fixed test that failed on second boundary
2015-03-19 15:12:43 +11:00
Greg Wilkins
c082848f93
462193 - Asynchronous HttpOutput.close()
...
Dispatch to handle on return from onWritePossible()
2015-03-18 10:28:14 +11:00
Simone Bordet
4f0c63734c
462162 - StackOverflowException when response commit fails.
...
Fixed HttpChannel to avoid to stack overflow in case of unusual
exceptions thrown while committing.
Now it directly calls the transport to try to send a 500.
2015-03-15 12:10:27 +01:00
Greg Wilkins
3f795da26c
459845 - Support upgrade from http1 to http2
...
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
Greg Wilkins
0dd58d2efe
459845 - Support upgrade from http1 to http2
...
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
Greg Wilkins
5456de2160
debug improvements from nghttp2 testing
2015-03-11 14:23:39 +11:00
Greg Wilkins
0592ecf3e9
cleaned up PushBuilder API
2015-03-11 12:06:51 +11:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Joakim Erdfelt
130afb9535
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06 15:57:52 -07:00
Joakim Erdfelt
dd88d393e4
456521 - ShutdownHandler should shut down more gracefully
...
Also-by: Johannes Brodwall <johannes@brodwall.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-03-06 15:47:51 -07:00
Greg Wilkins
9edd7c4b30
461070 Handle setReadListener on request with no content
2015-03-07 08:44:51 +11:00
Joakim Erdfelt
74ee154bb1
Cleaning up LeakTrackingByteBufferPool / LeakDetector
...
+ Making use of LeakTrackingByteBufferPool more consistent
+ Using MappedByteBufferPool.Tagged where appropriate in test cases
+ Adding leak count tracking to LeakDetector
+ Adding leak count tracking to LeakTrackingByteBufferPool
+ Renaming websocket LeakTrackingBufferPool to
LeakTrackingBufferPoolRule to reflect junit @Rule usage
+ Making websocket LeakTrackingBufferPoolRule always use
MappedByteBufferPool.Tagged
+ Fixed various grammar concerns
2015-03-06 14:27:58 -07:00
Greg Wilkins
9b5205ba40
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
2015-03-06 12:45:55 +11:00
Greg Wilkins
44bb8cefa5
461133 - allow stop port to reuse address
2015-03-06 12:23:58 +11:00
Greg Wilkins
48b6bec64c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2015-03-05 20:17:20 +11:00
Greg Wilkins
f4ad0dce98
461350 Update HttpParser IllegalCharacter handling to RFC7230
2015-03-05 19:54:25 +11:00
Greg Wilkins
9b307bc0ed
added leak detecting bufferpool to ssl tests
2015-03-05 16:55:10 +11:00
Greg Wilkins
165ae8f238
Improved LocalConnector
2015-02-26 20:13:45 +11:00
Greg Wilkins
af70c4bd48
protect event schedule race
2015-02-26 15:37:51 +11:00
Greg Wilkins
752973931e
Improved request buffer recycling
...
Added a reference count that is incremented for each content reference passed and decremented as each content is consumed.
The request buffer is only filled or recycled if the reference count is 0
2015-02-26 13:04:50 +11:00
Greg Wilkins
a24f702537
Avoid dispatch in HttpOutput
2015-02-25 19:33:43 +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
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
2015-02-24 10:38:28 -06: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
Simone Bordet
f61cfb7016
Fixed construction of MetaData.Request and handling of HttpFields by MetaData.
2015-02-20 16:36:11 +01:00
Greg Wilkins
b60ea47ef4
Revert "Revert "Fixed AsyncIO double dispatch""
...
This reverts commit 8bd94ec6be
.
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 968063c1ab
.
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
e18573f4a3
460211 Fixed Idle race in ExecuteProduceRun
...
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Greg Wilkins
c090f179a7
459845 - Support upgrade from http1 to http2/websocket
...
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11:00
Greg Wilkins
c3332e7d2e
459845 - Support upgrade from http1 to http2/websocket
...
Added support for unofficial "upgrade" from http/1 to h2c
2015-02-13 12:16:03 +11:00
Greg Wilkins
0f7ee8d607
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13 11:45:56 +11:00
Greg Wilkins
2b2a70a93a
459845 Support upgrade
...
Added the concept of UpgradeFrom and UpgradeTo connections that support
transferring a buffer with content before opening new connection.
Aded EndPoint.update method as utility
2015-02-13 11:41:18 +11:00
Simone Bordet
8ca0a86352
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:21:53 +01:00
Simone Bordet
be860741d5
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Simone Bordet
99da9ce98e
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-06 21:45:22 +01:00
Greg Wilkins
b1953a6859
added private key for debugging
2015-02-06 15:51:01 +11:00
Greg Wilkins
14cd10b676
experimenting with push API
2015-02-06 13:48:34 +11:00
Greg Wilkins
ab8b7f8c8d
PushBuilder uses full URI
2015-02-06 10:44:19 +11:00
Greg Wilkins
504ff73d03
default to delayed dispatch
2015-02-05 14:39:49 +11:00
Greg Wilkins
d08fced010
handle slow arriving input
2015-02-05 14:27:05 +11:00
Greg Wilkins
7db7ef3020
Added test cases and improved isReady and isFinished handling
2015-02-05 14:26:34 +11:00
Greg Wilkins
f6cfe07a69
added direct buffer configuration
2015-02-05 10:02:01 +11:00
Greg Wilkins
47055dd2c8
added test for async IO isNotReadyAtEOF
2015-02-04 12:40:36 +11:00
Joakim Erdfelt
03121edc92
Merge branch 'jetty-9.2.x'
2015-01-22 11:51:36 -07:00
Greg Wilkins
94f0f29540
458101 added test for maxFormContentSize
2015-01-22 12:41:13 +01:00
Joakim Erdfelt
48e5157731
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-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-01-21 11:00:54 -07:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Joakim Erdfelt
3f08e54a23
457696 - JMX implementation should not be overridden by WebApp classes
...
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
annotation influences too.
2015-01-16 15:18:01 -07:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Greg Wilkins
55bcd32448
fixed merge
2015-01-08 17:43:55 +01:00
Greg Wilkins
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
Greg Wilkins
c23f21c761
456956 Reduce ThreadLocal.remove() weak reference garbage
...
removed getCurrentChannel thread local
2015-01-08 15:03:05 +01:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
629035ba7a
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
Greg Wilkins
2b530939a7
456956 Reduce ThreadLocal.remove() weak reference garbage
...
reduced calls to getCurrentConnection
2015-01-07 20:56:06 +01:00
Greg Wilkins
3270af81e8
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-07 19:53:30 +01:00
Greg Wilkins
3d66b1d207
ensure onAllDataRead always called
2015-01-02 19:17:26 +01:00
Simone Bordet
caa579ab4b
Fixed buffer leaking in case the buffer is empty due to having read
...
zero from the network.
2015-01-02 18:19:04 +01:00
Greg Wilkins
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
Greg Wilkins
20fc880c3e
Merge branch 'master' into jetty-9.3-ewyk
2014-12-31 16:29:40 +01:00
Greg Wilkins
200b3a3e64
fixed merge
2014-12-31 16:28:35 +01:00
Greg Wilkins
2e3c223917
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-12-31 16:16:57 +01:00
Greg Wilkins
a89a6927e8
yet another refactor of HttpInput.... must read -1 before isFinished is true
2014-12-24 19:34:06 +01:00
Jan Bartel
fc2b6f0f74
455655 ensure multipart form-data parsing exception thrown to servlet
2014-12-24 18:25:27 +01:00
Greg Wilkins
26de8931a3
less verbose errors
2014-12-24 12:42:07 +01:00
Greg Wilkins
3e8969be6f
different callbacks for HTTP blocking and async reads
2014-12-24 10:31:33 +01:00
Greg Wilkins
fecc03a2f5
fixed some more tests after EWYK refactor
2014-12-23 22:20:49 +01:00
Greg Wilkins
3f59bc4c14
refactored HttpConnector for EWYK - work in progress
2014-12-23 17:15:27 +01:00
Simone Bordet
9cff4a57e7
Merged branch 'master' into 'jetty-9.3-ewyk'.
2014-12-22 21:34:10 +01:00
Simone Bordet
e8c88cfd9c
Merged branch 'jetty-9.2.x' into 'master'.
2014-12-22 21:32:09 +01:00
Simone Bordet
fc42d5d4aa
Configuring output aggregation size when configuring output buffer size.
2014-12-22 21:29:02 +01:00
Greg Wilkins
2a584613ee
work in progress on EWYK HTTP
2014-12-21 20:56:36 +01:00
Greg Wilkins
e363dd41c2
HttpConnection refactoring work in progress
2014-12-21 15:23:36 +01:00
Greg Wilkins
24ffe377ce
improved HttpInputTest
2014-12-21 12:42:27 +01:00
Greg Wilkins
ebaf84b97e
Refactored HttpInput to use poison pills
2014-12-21 10:43:37 +01:00
Greg Wilkins
b0b038f5b0
fillInterest never recurses
2014-12-19 23:03:01 +01:00
Simone Bordet
3d5c785dd3
Temporarily commented out non-compiling code.
2014-12-18 17:14:34 +01:00
Greg Wilkins
3b34423b17
EWYK SelectorManager
2014-12-18 17:06:32 +01:00
Greg Wilkins
97af3632a1
SelectManager executes endpoint tasks
2014-12-17 17:03:15 +01:00
Greg Wilkins
cdd2b0a9d2
refacted SelectorManager to have a ManagedSelector
2014-12-17 16:29:24 +01:00
Joakim Erdfelt
40ae4767d1
Some extra safety checks
2014-12-16 15:52:33 -07:00
Greg Wilkins
113d1ff7bb
fixed merge
2014-12-11 14:01:32 +01:00
Greg Wilkins
d161bdcb36
Merge remote-tracking branch 'origin/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-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
2014-12-11 13:50:21 +01:00
Greg Wilkins
dfe9dc3115
Further experimentation with PushBuilder
2014-12-09 12:27:39 +01:00
Greg Wilkins
06b1efc182
Added alternate push API and example
2014-12-05 17:47:25 +01:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Simone Bordet
d3763e0d1c
454157 - HttpInput.consumeAll spins if input is in async mode.
...
Added additional check to test whether consumeAll() could actually
consume the content, and if not, abort the channel.
2014-12-05 14:12:01 +01:00
Greg Wilkins
7b41e78f74
Improved HttpChannelOverHTTP2 recycling
2014-12-05 08:36:51 +01:00
Greg Wilkins
0f4a4cdac6
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-12-05 08:11:54 +01:00
Greg Wilkins
07e87f0ecf
454157 abort to avoid spin in async HttpInput.consumeAll
2014-12-04 17:39:53 +01:00
Greg Wilkins
2536c1cc3f
Handle HTTP2-16 black listed ciphers
2014-12-04 14:17:25 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Greg Wilkins
a181b09d4c
439374 Use utf-8 as default charset for html
2014-11-27 17:41:19 +11:00
Greg Wilkins
1159111c52
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2014-11-27 13:34:45 +11:00
Greg Wilkins
bd0cd80b58
Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x
2014-11-26 15:35:55 +11:00
Greg Wilkins
44ab3ba134
better debug
2014-11-26 15:35:42 +11:00
Joakim Erdfelt
ed594425d3
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
jetty-server/src/main/config/modules/server.mod
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-11-25 12:09:21 -07:00
Joakim Erdfelt
07647e8a5f
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-11-25 08:25:35 -07:00
Greg Wilkins
8e9e29f887
452188 Delay dispatch until content optimisation
...
Make delay the default
2014-11-21 10:02:24 +11:00
Greg Wilkins
121a8b6ee8
improved debugging
2014-11-21 10:00:18 +11:00
Simone Bordet
f7df8f9244
452516 - Make HttpOutput aggregation size configurable.
...
Introduced new property "outputAggregationSize" in HttpConfiguration,
and correspondent property in XML file.
2014-11-20 17:06:10 +01:00
Simone Bordet
8330fa73e0
452188 Delay dispatch until content optimisation.
...
Renamed property "delayDispatchUntilContent".
2014-11-20 17:06:10 +01:00
Simone Bordet
57f90ae7d1
452465 - 100% CPU spin on page reload.
...
Fixed by adding a MetaData.recycle() method that properly recycles
the MetaData.Request object so that HttpChannelOverHttp.earlyEOF()
properly closes the connection when it's idle.
2014-11-20 13:00:02 +01:00
Greg Wilkins
ab2e9c357f
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
2014-11-20 16:34:30 +11:00
Greg Wilkins
1915e592b5
452424 Do not add Date header if already set
2014-11-20 15:33:22 +11:00
Greg Wilkins
46a5ef861d
447472 Clear async context timeout on async static content
2014-11-20 11:41:11 +11:00
Greg Wilkins
aeccef2154
Merge remote-tracking branch 'origin/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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
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-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
2014-11-19 13:37:48 +11:00
Greg Wilkins
c334e81416
452188 Delay dispatch until content optimisation
...
Added module and xml support
2014-11-19 11:26:07 +11:00
Greg Wilkins
04f74f73a5
452188 Delay dispatch until content optimisation
2014-11-19 11:11:48 +11:00
Greg Wilkins
ce4af5a8b9
Implemented the PROXY protocol
...
Added XML templates
2014-11-14 12:04:57 +11:00
Greg Wilkins
5b60e0c98d
support h2-15 and h2-14
2014-11-14 10:53:37 +11:00
Greg Wilkins
a308c087ed
Implemented the PROXY protocol
...
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
2014-11-13 19:55:01 +11:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Greg Wilkins
dfe799d04c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
Added Interceptor chain so that double gzip interception can be prevented.
2014-11-12 12:36:56 +11:00
Simone Bordet
8c65df4ee6
Merged branch 'jetty-9.2.x' into 'master'.
2014-11-07 12:01:04 +01:00
Simone Bordet
9320e9e24a
450484 - Missing parameterization of etc/jetty-http[s].xml.
2014-11-07 11:56:58 +01:00
Greg Wilkins
47a92e9608
minor cleanups of HttpContent
2014-11-06 16:46:47 +11:00
Joakim Erdfelt
f2cbde13e2
Attempting to understand windows timeout hang
2014-11-05 14:39:12 -07:00
Joakim Erdfelt
67de171871
Adding test tracking to figure out where the test hang is coming from
2014-11-05 12:01:19 -07:00
Joakim Erdfelt
f645b4a399
Merge branch 'jetty-9.2.x'
2014-11-05 11:12:05 -07:00
Joakim Erdfelt
04e7be7383
Adding overall test timeout
2014-11-05 11:11:57 -07:00
Greg Wilkins
4cb8e7f644
449811 handle unquoted etags when gzipping
2014-11-05 11:12:17 +11:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
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