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

1484 Commits

Author SHA1 Message Date
Simone Bordet
cdcde53c6b Merged branch 'jetty-9.3.x' into 'master'. 2016-04-01 14:44:50 +02:00
Simone Bordet
ce04cadb79 Fixes #233 - Add message to idle TimeoutException. 2016-04-01 14:44:26 +02:00
Greg Wilkins
91bef55924 Issue #472 Use LongAdder for statistics 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-04-01 17:22:45 +11:00
thesnowgoose
82559c8dde Fix broken test 
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
 2016-03-30 11:23:44 -07:00
Greg Wilkins
3590abc534 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-30 20:05:59 +11:00
Greg Wilkins
c768828703 Issue #458 Improve Quality list handling 
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
 2016-03-30 19:07:11 +11:00
Greg Wilkins
9becd5e0dd added unit test to check #460 2016-03-30 18:56:55 +11:00
Greg Wilkins
330d21d27f Revert "Merge pull request #460 from thesnowgoose/master" 
This reverts commit f5ba7ae197fe35730325893d3634421ca7c58d16, reversing
changes made to 0fe1bbcd91ca8d3c0a79471ea964cb7279a5cfe9.

The change fails for /foo/../../bar paths, as it returns bar rather than null
 2016-03-30 18:55:09 +11:00
thesnowgoose
f1cd6f6e4d Improve canonicalPath method in URIUtil.java 
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
 2016-03-29 18:01:55 -07:00
thesnowgoose
7f0fbff17e Improve canonicalPath method in URIUtil.java 
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
 2016-03-29 12:49:56 -07:00
Joakim Erdfelt
4822bea0b1 Issue #438 - File and Path Resources with control characters should be rejected 
+ Removing regex
+ Adding StringUtil.indexOfControlChars()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2016-03-18 11:51:32 -07:00
Joakim Erdfelt
05691e1646 Issue #438 - File and Path Resources with control characters should be rejected 
+ Adding testcases
+ Cleaning up unit tests, adding more
+ Fixing one testcase related to FileResource.addPath()
+ Adding validation of filesystem paths

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2016-03-17 16:13:07 -07:00
Joakim Erdfelt
3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Greg Wilkins
1c5a1fc6a2 Issue #431 
Suppress stack traces from unit tests
 2016-03-16 18:19:40 +11:00
Joakim Erdfelt
1b1c331763 Fixing merge detritus 2016-03-15 09:28:47 -07:00
Joakim Erdfelt
dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Simone Bordet
26f8deddf7 Introduced Callback.Nested. 
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
 2016-03-15 15:24:44 +01:00
Greg Wilkins
0c14432db3 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-10 12:44:41 +11:00
Greg Wilkins
fa8b1c9220 Revert "Issue #414 ContainerLifeCycle should not stop failed component on remove" 
This reverts commit 34c8ded756fb482a30754c44dbda3426bbf630f2.
The test is a race and failed components should be stopped when removed so listeners can be called.
 2016-03-10 12:42:50 +11:00
Greg Wilkins
eac3a4a439 Merge branch 'jetty-9.3.x' 2016-03-10 12:35:44 +11:00
Greg Wilkins
34c8ded756 Issue #414 ContainerLifeCycle should not stop failed component on remove 
Only stop isRunning components when removed
 2016-03-10 12:29:02 +11:00
Simone Bordet
13f267bf8a Merged branch 'jetty-9.3.x' into 'master'. 2016-03-07 16:11:41 +01:00
Greg Wilkins
d48cfcdb62 Issue #397 Multipart EOF handling 
read to EOF when reading multipart.
 2016-03-05 17:50:56 +01:00
Simone Bordet
2c11372bc4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-29 17:17:09 +01:00
Simone Bordet
cec3694355 Consistently using BufferUtil, especially clearToFill() and 
flipToFlush().
 2016-02-29 16:31:38 +01:00
Osman Üngür
966cffccb8 Fix typo in annotation 
Signed-off-by: Osman Ungur <osmanungur@gmail.com>
 2016-02-26 19:37:27 +02:00
Greg Wilkins
92c339e669 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-17 12:09:00 +01:00
Jan Bartel
11d3448e28 Issue #81 Exception not always thrown in Jetty to application when upload part is too big 
Issue #82 Request.getPart() that results in Exception still allows other parts to be fetched
 2016-02-16 17:43:56 +01:00
Greg Wilkins
26217a73c1 Merge pull request #72 from gouessej/master 
Bug 485625 - Allow overriding the conversion of a String into a Crede…
 2016-02-15 12:56:15 +01:00
Simone Bordet
2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet
6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet
145e4bee71 487511 - Jetty HTTP won't work on turkish systems. 
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
 2016-02-09 17:50:26 +01:00
Greg Wilkins
df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Jan Bartel
1b7045babd 486394 Make old behaviour of MultiPartInputStreamParser configurable 2016-02-03 14:15:15 +01:00
Jan Bartel
d151143556 Revert "486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file" 
This reverts commit 734d18fb93da4f363acca96bd78ca6ca0f4b577b.
 2016-02-03 14:15:15 +01:00
Greg Wilkins
7ec6e2e899 486930 - Selector does not correctly handle rejected execution exception 
Improved comments and unit test
 2016-02-01 17:18:42 +01:00
Greg Wilkins
c81dcfc790 486930 - Selector does not correctly handle rejected execution exception 
This fix work in two ways:

1) Both the PEC and EPC strategies when confronted with a
RejectedExecutionException will continue to Produce rather than consume.

2) If a produced Runnable cannot be consumed and it supports the new Rejectable interface,
then it's reject() method is called by the producer thread.    Typically this is implemented
to close the connection - with the risk being that the close might block, but that is
probably better than leaking the connection?
 2016-02-01 17:10:24 +01:00
Jan Bartel
599696bfc5 Merge branch 'master' into session-refactor 2016-02-01 16:57:35 +01:00
Jan Bartel
a8c29334ca Merge branch 'master' into session-refactor 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
 2016-02-01 13:59:12 +01:00
Joakim Erdfelt
734d18fb93 486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file 
+ Refactored fileSizeThreshold logic so that a configuration value of
   0 is always create file
   (negative) is never create file
   positive is tested against filesize
 2016-01-22 14:07:51 -07:00
Julien Gouesse
ac1afed323 Merge branch 'master' of https://github.com/eclipse/jetty.project 2016-01-19 20:17:23 +01:00
Julien Gouesse
7ab6127e33 Bug 485625 - Allow overriding the conversion of a String into a Credential 
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
 2016-01-15 18:51:37 +01:00
Greg Wilkins
c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt
0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Greg Wilkins
41329dccc4 Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability" 
This reverts commit 46ed803023d1fda6abe81a5deb8100c38416ccf3.
The fix broke several unit tests.
 2016-01-13 15:38:27 +11:00
Greg Wilkins
46ed803023 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:18:13 +11:00
Greg Wilkins
e2a0794d91 485712 - Quickstart web.xml is absolute 2016-01-13 12:47:25 +11:00
Jan Bartel
9146d11746 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:32:15 +11:00
Jan Bartel
75b84374e0 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:27:33 +11:00
Simone Bordet
f519aa28fb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-05 11:40:57 +01:00