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

4782 Commits

Author SHA1 Message Date
Greg Wilkins
f4d9223762 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-16 14:16:44 +11:00
Greg Wilkins
73924d2774
Issue #4188 Spin in close of GzipHandler (#4198) 
* Issue #4188 Spin in close of GzipHandler

Cleanup and simplify code

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4188 Spin in close of GzipHandler

Fix slice code. Added unit test for it.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4188 Spin in close of GzipHandler

Fixed last slice.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-16 14:12:52 +11:00
Jan Bartel
92c8bb8dd5
Issue #4158 Re-enable support for duplicate session cookies. (#4168) 
* Issue #4158 Re-enable support for duplicate session cookies.

Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-16 14:08:51 +11:00
Greg Wilkins
8f1975cc04 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-16 14:00:22 +11:00
Greg Wilkins
2eb251a4b8 fix logging defaults to INFO 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-16 13:53:57 +11:00
Joakim Erdfelt
fa25d560b3
Fixing typo 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-10-15 13:52:39 -05:00
Simone Bordet
6b26ac9ee9 Fixes #4190 Jetty hangs after thread blocked in SharedBlockingCallback.block() called by HttpOutput.close. 
Now releasing the buffer when in CLOSING state.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-10-15 15:47:03 +02:00
Simone Bordet
a0e90bab96 Fixes #4190 Jetty hangs after thread blocked in SharedBlockingCallback.block() called by HttpOutput.close. 
Now handling correctly the CLOSING case in HttpOutput.close().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-10-15 12:45:10 +02:00
Joakim Erdfelt
0fbb507841
Issue #4191 - GzipHandler.minGzipSize cannot be lower then 23. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-10-14 13:21:01 -05:00
Greg Wilkins
f09e03c586
Issue #4156 - Session Already in Cache during forwarding (#4159) 
* Issue #4156 - Adding test to replicate issue

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4156 Session already in cache

+ check validity of sessions in getSession(SessionHandler)
+ do not replace session in doScope if SessionHandler is the same.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-14 11:18:37 +11:00
Simone Bordet
20e70c147b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-10 12:45:53 +02:00
Simone Bordet
ec56739d3c
Merge pull request #4180 from eclipse/jetty-9.4.x-4179-SendCallback-gc 
Issue #4179 SendCallback GC
 2019-10-10 12:45:30 +02:00
Simone Bordet
4e69122537 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-10 11:02:32 +02:00
Greg Wilkins
ce41c122a6
Issue #4176 setHeader after sendError (#4181) 
* Issue #4176 setHeader after sendError

SendError now makes the response immutable for headers and status.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4176 setHeader after sendError

cleanup after review
better names

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4176 setHeader after sendError

better name

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4176 setHeader after sendError

even better name

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-10 19:35:28 +11:00
Greg Wilkins
faac5d7f04 Issue #4179 SendCallback GC 
The HttpConnection.SendCallback nulls it's reference to buffers and callbacks after completion to assist with easy GC, since the connection callback is a long lived instance.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-10 09:09:53 +11:00
Simone Bordet
783f3b49b0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-09 10:22:18 +02:00
Greg Wilkins
31a0180133 Improve debug logging of gzip inflation 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-09 11:51:13 +11:00
Greg Wilkins
8087e29211 Reverted getSession(id) to public 
This method is used by third party session handlers.
Reverts change made as part of #3913

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-10-09 11:46:43 +11:00
Joakim Erdfelt
d7a189fa18 Updating to version 10.0.0-SNAPSHOT 2019-10-03 12:05:26 -05:00
Joakim Erdfelt
fd6a2cb9f6 Updating to version 10.0.0.alpha1 2019-10-03 11:25:06 -05:00
Simone Bordet
bc663d2d63 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-02 10:18:40 +02:00
Simone Bordet
7810f2dec2 Reverted 82a00524d17b79a9b48dd9279395866d7ce0cbd4. 
The connection upgrade check is necessary both after the parsing and
after the handling. After the parsing covers HTTP/2 prior knowledge
"PRI * HTTP/2" case; after the handling covers the WebSocket case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-10-02 10:18:06 +02:00
Joakim Erdfelt
6fc42d8ba2 Merge branch 'release-9.4.21' into jetty-9.4.x 2019-10-01 13:35:43 -05:00
Simone Bordet
17b25ca74a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-01 18:11:01 +02:00
Simone Bordet
a380f6b7b9
Merge pull request #4081 from eclipse/jetty-9.4.x-HttpConnection_UpgradeCheck 
Remove unnecessary Connection upgrade check
 2019-10-01 18:10:23 +02:00
Joakim Erdfelt
7807eafad9 Updating to version 9.4.22-SNAPSHOT 2019-09-26 10:46:28 -05:00
Joakim Erdfelt
72970db61a Updating to version 9.4.21.v20190926 2019-09-26 09:59:15 -05:00
Lachlan Roberts
af081459ee Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-25 15:06:17 +10:00
Greg Wilkins
11b60db4c3
Issue #4047 Graceful Write (#4100) 
Added test to reproduce issue
Fixed bug from #2772 where output was shutdown on DONE without checking for END.
Fixed aggregation logic to aggregate last write if aggregation already started
Improved comments and clarify conditions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-25 12:13:56 +10:00
Simone Bordet
f10325ea50
Merge pull request #3959 from eclipse/jetty-10.0.x-3952-server_direct_heap_bytebuffers 
Fixes #3952 - Server configuration for direct/heap ByteBuffers.
 2019-09-23 15:24:47 +02:00
Simone Bordet
0eec727a09 After review, renamed *directBuffers to *directByteBuffers. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-17 12:16:10 +02:00
Simone Bordet
44e4633af0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-17 11:37:47 +02:00
Simone Bordet
f85382aa9d
Merge pull request #4086 from eclipse/jetty-9.4.x-1036-SchedulerThreads 
Issue #1036 Configure Scheduler
 2019-09-17 11:37:23 +02:00
Simone Bordet
bee079c021 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-17 11:18:51 +02:00
Lachlan Roberts
a0cd331327 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-HttpConnection_UpgradeCheck 2019-09-17 13:11:43 +10:00
Greg Wilkins
bcf6b4c581 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1036-SchedulerThreads 2019-09-17 12:36:23 +10:00
Simone Bordet
422b9bded5 Fixes #3747 - Make Jetty Demo work with JPMS. 
Introduced module `jdbc` and made other modules that require JDBC depend on it.
Modified demo.ini to enable the `jdbc` module because some webapp descriptor
of the demo requires JDBC classes.

Now the demo can be run fine on the module-path just by adding --jpms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-16 22:57:55 +02:00
Simone Bordet
1ef4a416b5 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3952-server_direct_heap_bytebuffers'. 2019-09-16 12:26:26 +02:00
Joakim Erdfelt
3861e9f9ca Merge branch 'jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 2019-09-13 10:02:05 -05:00
Joakim Erdfelt
39c230f294
Merge pull request #4083 from eclipse/jetty-9.4.x-97-Unavailable 
Issue #97 ServletHolder unavailable handling
 2019-09-13 09:58:09 -05:00
Greg Wilkins
ae0ab46066 Issue #97 Unavailable handling 
Added test for servlet component lifecycle
Fixed bug where we were destroying listeners before calling them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-13 11:40:11 +10:00
Greg Wilkins
92e4d73dcb Issue #1036 Configure Scheduler 
Allows scheduler configuration

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-13 09:52:28 +10:00
Simone Bordet
098f5029c8 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-12 15:51:23 +02:00
Lachlan Roberts
3068b4c8ae fix build issues 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-12 11:04:05 +10:00
Lachlan Roberts
82a00524d1 remove unnecessary connection upgrade check 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-12 10:52:06 +10:00
Greg Wilkins
905bf82f80 reformatting 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-12 10:14:58 +10:00
Simone Bordet
d69a1f0f58 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3537-bootstrap_websocket_http2'. 2019-09-12 00:11:01 +02:00
Simone Bordet
f942cd4687 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4058-autolock'. 2019-09-11 22:41:11 +02:00
Joakim Erdfelt
6ae7427d55 Merge branch 'jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/pom.xml
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
 2019-09-11 09:42:56 -05:00
Joakim Erdfelt
43e10f8a5e
Merge pull request #4056 from eclipse/jetty-9.4.x-testing-embedded-examples 
Unit Testing the Embedded Examples
 2019-09-11 09:20:10 -05:00