Joakim Erdfelt
eae38b4c28
Merge branch 'jetty-9.3.x'
2015-11-05 10:34:53 -07:00
Joakim Erdfelt
c8ec399af2
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-11-05 10:34:30 -07:00
Joakim Erdfelt
486e890d5d
481236 - Make ShutdownMonitor java security manager friendly
...
+ Limit access to specific System properties
2015-11-05 10:33:25 -07:00
Greg Wilkins
fc9f42e11a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2015-11-05 18:39:04 +11:00
Greg Wilkins
bd8f0b2dba
481418 ResourceHandler sets last modified
2015-11-05 08:52:03 +11:00
Greg Wilkins
8caef29126
481418 ResourceHandler sets last modified
2015-11-05 08:31:36 +11:00
Jan Bartel
d5649e1d1b
481075 Session statistics are not accurate
2015-11-04 18:15:43 +11:00
Jan Bartel
c63ef3e08b
481373 Corner cases where session may remain in JDBCSessionManager memory
2015-11-04 17:24:38 +11:00
Jan Bartel
06f3486b8d
481373 Corner cases where session may remain in JDBCSessionManager memory
2015-11-04 17:23:42 +11:00
Joakim Erdfelt
92cc44c1a3
Javadoc fix: HttpServletRequest#getPushBuilder() does not exist
...
+ Fixing bad order (@throws, @param, @return) to correct order @param, @return, @throws
2015-11-02 13:34:49 -07:00
Joakim Erdfelt
30888e134b
Set what you test
2015-11-02 13:28:45 -07:00
Simone Bordet
5062756135
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-02 12:17:00 +01:00
Simone Bordet
58027a3421
481225 - Secondary resources with query parameters are not properly pushed.
...
Fixed by making PushCacheFilter remember the query parameters for
secondary resources, so that the PUSH_PROMISE frame can be correctly
generated with the query parameters.
2015-11-02 11:37:17 +01:00
Greg Wilkins
fa53b11850
fixed reset of DispatcherType
2015-10-30 10:35:37 +11:00
Greg Wilkins
de7ac72cf4
Proxy TLS version
2015-10-29 19:32:38 +11:00
Greg Wilkins
9fe7332413
Implemented v2 of the ProxyConnection protocol
2015-10-29 16:45:50 +11:00
Greg Wilkins
5093aa3d40
Updated PushBuilder to draft for servlet 4.0
2015-10-28 17:33:38 +11:00
Greg Wilkins
36de309e9f
480162 - Continuations behavior differences due to HttpURI behavior
...
Cleaned up handling of original URI
2015-10-28 17:33:05 +11:00
Greg Wilkins
4ffe0d375e
480162 - Continuations behavior differences due to HttpURI behavior
...
Only set scheme in SecureRequestCustomizer if not already set
2015-10-28 16:04:34 +11:00
Greg Wilkins
7415163f59
Merge remote-tracking branch 'origin/jetty-9.3.x'
2015-10-21 17:47:58 +11:00
Greg Wilkins
c156f6593c
480162 - Continuations behavior differences due to HttpURI behavior
...
reverted 3e460dd219000cf6c5cc920e228fb98fb8746eb3
added test clarifications
2015-10-21 15:18:12 +11:00
Simone Bordet
5c8c590398
Merged branch 'jetty-9.3.x' into 'master'.
2015-10-20 23:23:25 +02:00
Joakim Erdfelt
a01565fbc4
478757 - DebugHandler thread name is mangled
...
+ Removing scheme check, now that HttpURI is sane
2015-10-20 11:56:43 -07:00
Joakim Erdfelt
3e460dd219
480162 - Continuations behavior differences due to HttpURI behavior
...
+ When fixing URI.absolute with authority, default to scheme 'http'
(allowing things like SecureRequestCustomizer to change it again
to 'https')
2015-10-20 11:55:45 -07:00
Joakim Erdfelt
22573be353
Fixing format error on toString()
2015-10-20 11:28:19 -07:00
Joakim Erdfelt
fae4f5d43f
Merge branch 'jetty-9.3.x'
2015-10-19 11:59:44 -07:00
Joakim Erdfelt
8eda037de0
Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x
2015-10-19 11:59:21 -07:00
Joakim Erdfelt
435ce8c3ab
478757 - DebugHandler thread name is mangled
...
+ Replicating reopened bug with double-scheme https
in testcase
+ Adding safety check for https in thread name determination
2015-10-19 11:58:04 -07:00
Simone Bordet
964afc3020
Merged branch 'jetty-9.3.x' into 'master'.
2015-10-19 12:35:26 +02:00
Greg Wilkins
570c751ec8
479179 Fixed NPE from debug
2015-10-17 09:37:43 +11:00
Greg Wilkins
cfeee5cec7
479903 - improve async onError handling
2015-10-16 14:51:57 +11:00
Joakim Erdfelt
28daeb912d
Merge branch 'release-9.3.5' into jetty-9.3.x
2015-10-13 09:07:50 -07:00
Joakim Erdfelt
4dfd68b315
Merge branch 'jetty-9.3.x'
...
Conflicts:
aggregates/jetty-all-compact3/pom.xml
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/cdi-core/pom.xml
jetty-cdi/cdi-full-servlet/pom.xml
jetty-cdi/cdi-servlet/pom.xml
jetty-cdi/cdi-websocket/pom.xml
jetty-cdi/pom.xml
jetty-cdi/test-cdi-webapp/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-http2/http2-alpn-tests/pom.xml
jetty-http2/http2-client/pom.xml
jetty-http2/http2-common/pom.xml
jetty-http2/http2-hpack/pom.xml
jetty-http2/http2-http-client-transport/pom.xml
jetty-http2/http2-server/pom.xml
jetty-http2/pom.xml
jetty-infinispan/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/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/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-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-http-client-transport/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/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-infinispan-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-10-13 08:53:35 -07:00
Joakim Erdfelt
29d63b41b1
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
2015-10-13 08:39:45 -07:00
Joakim Erdfelt
b02783220e
Renaming old 'SelectChannel*' test for new naming scheme
2015-10-13 08:10:16 -07:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Greg Wilkins
b1f963ae59
ForwardedFor module
2015-10-09 10:21:15 +11:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Joakim Erdfelt
f2e0a46058
478752 - Clarify support for HttpServletRequest.upgrade()
...
+ Indicating lack of upgrade() support with ServletException
2015-10-07 14:40:01 -07:00
Greg Wilkins
4d4ed7bbe2
478923 Add XML property for blockingTimeout
2015-10-06 09:14:19 +11:00
Joakim Erdfelt
5300f0c7f7
478757 - DebugHandler thread name is mangled
...
+ Added testcase, and fixed handler for threadname output.
2015-09-30 12:47:31 -07:00
Simone Bordet
90743d301a
Improved toString().
...
Changes imported manually from branch 9.2.x.
2015-09-29 12:06:01 +02:00
Simone Bordet
1f2f62cff4
Revert "Merged branch 'jetty-9.2.x' into 'master'."
...
This reverts commit 701ca1aa26b0660d054faa4fd7ba9548a0b5cd58, reversing
changes made to 64ba5a6ef8558c70ae053a7854891273fe4ea5bf.
2015-09-29 11:31:56 +02:00
Simone Bordet
9549b32ea6
Revert "Merged branch 'jetty-9.2.x' into 'master'."
...
This reverts commit db61fc2a473c98d75a30aac7fba306c62677d960.
2015-09-29 11:31:03 +02:00
Simone Bordet
db61fc2a47
Merged branch 'jetty-9.2.x' into 'master'.
2015-09-29 09:43:12 +02:00
Simone Bordet
701ca1aa26
Merged branch 'jetty-9.2.x' into 'master'.
2015-09-29 09:42:28 +02:00
Simone Bordet
fd5c5b5779
Improved toString().
2015-09-28 19:23:50 +02:00
