2571 Commits

Author SHA1 Message Date
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
Jan Bartel
84239bc7f2 Start making unit tests work. 2015-10-23 16:52:05 +11:00
Jan Bartel
c5489bd7b2 Renaming from temporary session.x package 2015-10-23 14:10:42 +11:00
Jan Bartel
305b7bb776 Hook up scavenging; implement HashSessionManager; add delete unrestorable sessions to session data stores 2015-10-23 11:43:12 +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
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
Jan Bartel
d91fe48edc Finish scavenging impl for Hash and JDBC session mgmt. 2015-10-09 18:53:17 +11:00
Greg Wilkins
b1f963ae59 ForwardedFor module 2015-10-09 10:21:15 +11: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
Jan Bartel
e2ecf7ca14 More implementation. 2015-10-08 08:05:52 +11: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
Joakim Erdfelt
58203893b6 Fixing javadoc 2015-09-25 09:49:29 -07:00
Greg Wilkins
007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod
Added some additional features to configure the java.util.logging mechansim
2015-09-25 14:08:31 +10:00
Jan Bartel
06fbf447fb 478247 WebappClassLoader pinned after redeploy 2015-09-24 14:03:37 +10:00
Simone Bordet
460673f04b 477890 - Overwhelmed HTTP/2 server discards data.
HttpInput was using a bounded ArrayQueue with max capacity 64.
The queue was overflowing if there were more than 64 reads within the
flow control window capacity.

Fixed by replacing the ArrayQueue with ArrayDeque, which is unbounded.
2015-09-21 09:34:15 +02:00
Greg Wilkins
269ac1a44e 477737 Improve handling of etags with dynamic and static gzip
Fixed spin on --gzip etag
2015-09-18 14:54:07 +10:00
Greg Wilkins
67aee72bdd 477680 Encode merged query parameters 2015-09-18 13:19:00 +10:00
Greg Wilkins
99f4ed7352 477737 Improve handling of etags with dynamic and static gzip 2015-09-18 12:30:02 +10:00
Simone Bordet
014d021618 Removed unnecessary test condition. 2015-09-18 01:46:46 +02:00
Greg Wilkins
2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
2015-09-17 18:19:58 +10:00
Jan Bartel
fa8232d3c8 More implementation 2015-09-11 19:52:05 +10:00
Greg Wilkins
02c5ea30be 477123 - AsyncListener callbacks need context scope
Also added DebugListener and deprecated DebugHandler
2015-09-11 12:06:23 +10:00
Jan Bartel
79ce5db312 Using SessionKey class 2015-09-10 10:46:43 +10:00
Jan Bartel
bf2a1fa29e Merge remote-tracking branch 'origin/master' into session-refactor 2015-09-09 16:13:10 +10:00
Jan Bartel
3e3bfb9d6b Does not compile, draft of changes. 2015-09-04 12:07:24 +10:00
Joakim Erdfelt
49c927974b Javadoc fix 2015-09-02 09:26:12 -07:00
Simone Bordet
bee5437bad 475927 - SecureRequestCustomizer fails to match host.
Cosmetic changes during review.
2015-08-27 11:14:33 +02:00
Jan Bartel
c45cd8ce03 Partial refactoring - does not yet compile. 2015-08-27 18:03:44 +10:00
Greg Wilkins
8070ce61f3 475927 - SecureRequestCustomizer fails to match host.
Moved host and wildcard to new X509 class
2015-08-27 12:25:52 +10:00
Simone Bordet
7057dae67b 475927 - SecureRequestCustomizer fails to match host.
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
2015-08-26 20:36:43 +02:00