Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,493 Commits 55 Branches 466 Tags
Commit Graph

2758 Commits

Author SHA1 Message Date
Joakim Erdfelt
22f9c9826d Javadoc fixes 2015-12-19 12:46:52 -07:00
Greg Wilkins
5cd676581c 484622 - Improve handling of Direct and Mapped buffers for static content 
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer.  Thus content size may be 0, 1 or 2 times the
file size.

Some more limited unit tests
 2015-12-18 12:36:27 +11:00
Joakim Erdfelt
343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
	jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
	jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
 2015-12-16 12:56:13 -07:00
Greg Wilkins
3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Greg Wilkins
6978eeb5c4 483422 - Empty chunked body in 304 Response 
test harness only
 2015-12-02 12:41:51 +11:00
Greg Wilkins
a2c057892e 483039 - HTTP2 Upgrade case sensitivity on Connection header 2015-11-26 07:06:38 +11:00
Greg Wilkins
204591ce82 482855 - Content-Length omitted for POST requests with empty body 
Removed HTTP 0.9 support
A few code simplifications
Fixed clients relying on Content-Length headers being ignored
 2015-11-25 20:50:59 +11:00
Simone Bordet
ce41b7124f 482506 - HTTP/2 load test with h2load fails. 
Returning true if the upgrade succeeds to signal to the HttpParser to
stop parsing, leaving all the work and the buffer to the new connection.
 2015-11-18 19:25:34 +01:00
Joakim Erdfelt
4e773c16e2 Merge branch 'release-9.3.6' into jetty-9.3.x 2015-11-18 11:24:04 -07:00
Greg Wilkins
12ec44894b 482272 Fixed relative symlink checking 2015-11-18 11:13:35 +11:00
Joakim Erdfelt
edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins
4bb63b9e03 481355 Nested Symlinks 2015-11-06 13:54:47 +11:00
Greg Wilkins
56afc2b0e5 481554 DispatcherType reset race 
Cherry pick of fa53b11850eab2162ce4e2c980aaf280c9355ceb

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2015-11-06 10:38:08 +11: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
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
c63ef3e08b 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:24:38 +11: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
c156f6593c 480162 - Continuations behavior differences due to HttpURI behavior 
reverted 3e460dd219000cf6c5cc920e228fb98fb8746eb3
added test clarifications
 2015-10-21 15:18:12 +11: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
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
Greg Wilkins
570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +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
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
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
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