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
d1ead3dcd6
improved javadoc
2014-11-05 17:53:46 +11:00
Greg Wilkins
4cb8e7f644
449811 handle unquoted etags when gzipping
2014-11-05 11:12:17 +11:00
Greg Wilkins
3164243fb8
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
2014-11-05 11:08:31 +11:00
Greg Wilkins
c9c6ec8d63
449811 handle unquoted etags when gzipping
2014-11-05 11:07:14 +11:00
Greg Wilkins
d410fa57b5
449811 handle unquoted etags when gzipping
2014-11-05 11:03:10 +11:00
Greg Wilkins
50b6391be1
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-11-05 10:36:57 +11:00
Greg Wilkins
63d6754ea1
449594 Handle ArrayTrie overflow with false return
2014-11-05 10:32:10 +11:00
Joakim Erdfelt
04fc803b0e
448446 - org.eclipse.jetty.start.Main create classloader duplicate
...
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07: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
8df8b2b158
set for release
2014-11-03 13:17:20 -06:00
Jesse McConnell
bed3e61f35
set for fix
2014-11-03 13:16:21 -06:00
Joakim Erdfelt
1d88eab518
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
Joakim Erdfelt
214246061e
449291 - --create-files downloads without license
...
+ Adding dist-home replicationa real distribution
Adding RebuildTestResources.java to help rebuild this dist-home
occasionally. There is no need to keep this directory up to date
as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
Simone Bordet
64597b318c
Merged branch 'jetty-9.2.x' into 'master'.
2014-11-03 17:25:37 +01:00
Joakim Erdfelt
153dd4023e
Removing support for module [ini-template] use of --module=<name>
...
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
2014-11-03 09:19:05 -07:00
Joakim Erdfelt
83e3a29fbd
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-11-03 09:19:05 -07:00
Simone Bordet
9c64fb73e4
449603 - OutputStreamContentProvider hangs when host is not available.
...
Fixed by having HttpRequest.abort() to fail the ContentProvider.
In this way, the ContentProvider knows, even before being used to
send the request content, that the request has failed, and may
forward the failure to the client code.
2014-11-03 16:50:59 +01:00
Simone Bordet
cbd7b75e10
Removed unused code.
2014-11-03 10:55:13 +01: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
Jesse McConnell
7c35f04152
set for release
2014-10-31 09:28:38 -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
Jan Bartel
947a872203
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-31 13:31:12 +11:00
Jan Bartel
30081946d7
449372 Make jvmArgs of jetty:run-forked configurable from command line
2014-10-31 13:29:45 +11:00
Joakim Erdfelt
43b3cd9f46
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-10-30 15:05:24 -07:00
Greg Wilkins
d970e3d58b
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-31 07:43:53 +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
Jesse McConnell
19d9456756
set for release
2014-10-30 10:58:44 -05:00
Greg Wilkins
154daa524a
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-10-30 18:06:37 +11:00
Greg Wilkins
171f7b5352
improved protocol info log
2014-10-30 17:48:24 +11:00
Jan Bartel
d0a6a34fcc
448675 Impossible to set own Threadpool when using jetty-maven-plugin
2014-10-30 17:19:22 +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
cde420a2fc
448225 Removed unnecessary synchronize on initParser
2014-10-30 11:32:26 +11:00
Greg Wilkins
9189c934d9
444722 Fixed order of setReuseAddress call
2014-10-30 11:28:45 +11:00
Joakim Erdfelt
20febe4405
Bumping up version
2014-10-29 16:56:10 -07:00
Joakim Erdfelt
e72fed9d4e
Bumping up versions
2014-10-29 16:40:43 -07:00
Joakim Erdfelt
7cbd3c0488
440925 - NPE when using relative paths for --start-log-file
2014-10-29 16:25:55 -07:00
Joakim Erdfelt
8899f6d360
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt
149ed3a553
Enabling cdi.mod in distribution
2014-10-29 15:50:56 -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