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

16206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WalkerWatch
8bdab72fc0 Merge branch 'jetty-9.4.x' 2017-12-19 12:30:18 -05:00
WalkerWatch
2c0f695386 Documentation formatting corrections 2017-12-19 12:29:44 -05:00
WalkerWatch
05c3413907 Merge branch 'jetty-9.4.x' 2017-12-19 10:04:28 -05:00
Simone Bordet
19dbab7971 Fixes #2069 - Update the PushCacheFilter documentation. (#2070) 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-19 10:03:30 -05:00
Simone Bordet
b68fbc4cfb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-12-16 23:36:53 +01:00
Simone Bordet
37388ef105 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-12-16 23:28:05 +01:00
Simone Bordet
eaa4c70cfc Issue #2065 - Backport #347 to Jetty 9.2.x. 
Implemented as integer guard + timestamp.
The timestamp is not enough to guard against long times spent sending
(and/or in application callbacks during sends).
 2017-12-16 22:25:59 +01:00
Simone Bordet
ce4fad3deb Fixes #2065 - Backport #347 to Jetty 9.2.x. 2017-12-15 17:48:47 +01:00
WalkerWatch
c5f7e2a523 Merge branch 'jetty-9.4.x' 2017-12-14 13:38:27 -05:00
WalkerWatch
48a4db637f Issue #2039 - Added link to related documentation 2017-12-14 13:38:02 -05:00
Simone Bordet
d3db89d7e3 Fixes #2019 - Expose HttpClientTransport in JMX. 
Added missing @ManagedObject annotation to AbstractConnectorHttpClientTransport.

Also exported to JMX the "multiplexed" attribute for the FCGI transport
and the "useALPN" attribute for the HTTP/2 transport.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-14 12:28:46 +01:00
Simone Bordet
ba5ed4c6ce Issue #2050 - Clarify ObjectMBean getObject[Name|Context]Basis() methods. 
Clarified the role of the HttpClient name with respect to JMX.
Improved test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-14 11:24:43 +01:00
Simone Bordet
f2bf3d63bc Fixes #2020 - Introduce a name for HttpClient instances. 
Added HttpClientMBean, and overridden getObjectContextBasis() so that
the HttpClient name is inherited by children components such as the
HttpClientTransport, the ThreadPool, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-14 11:24:43 +01:00
Jan Bartel
b177202675 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-14 10:12:42 +01:00
Jan Bartel
18cd1fb8df
Issue #2057 Add conscrypt test in osgi (#2058) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-14 09:48:12 +01:00
Jan Bartel
7a8130eee0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-14 09:46:09 +01:00
Jan Bartel
eebe139494
Jetty 9.4.x 2043 concurrentmodification annotation parsing (#2052) 
* Issue #2043 Fix ConcurrentModificationException listing duplicate class scanning

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-14 09:45:29 +01:00
Greg Wilkins
8660055574
Issue #2010 Support FIPs Key Managers (#2044) 
Issue #2010 Support FIPs Key Managers, by only wrapping the default Key Manager if we have wildcard CN's or more than 1 non wild CN.  FIPs users will need to install a
keystore than has no multiple certificates than can only be resolved by SNI. They will also need to have no certificate aliases.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-14 00:15:58 +01:00
WalkerWatch
940b05ce8c Merge branch 'jetty-9.4.x' 2017-12-13 11:37:30 -05:00
WalkerWatch
ce819b5430 Issue #2039 - Updated documentation examples. 2017-12-13 11:37:00 -05:00
Jan Bartel
8e21c2f303 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-13 14:56:26 +01:00
Jan Bartel
8665348258
Issue #2015 add osgi headers for alpn conscrypt (#2027) 
* Issue #2015 add osgi headers for alpn conscrypt

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-13 14:55:34 +01:00
Jan Bartel
84c016571d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-13 11:10:31 +01:00
Jan Bartel
f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled (#2031) 
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-13 11:04:55 +01:00
Jan Bartel
1da25bca58 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-13 11:03:08 +01:00
Jan Bartel
2df07f29e9
Jetty 9.4.x 2016 openjdk8 osgi headers (#2026) 
* Issue #2016 Add osgi headers for openjdk8 alpn and add tests for http2 in osgi

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-13 10:38:13 +01:00
Simone Bordet
bb4115abf2 Fixes #2050 - Clarify ObjectMBean getObject[Name|Context]Basis() methods. 
Updated the class with better formatting, added javadocs, updated old
javadocs, removed warnings, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-12 19:31:28 +01:00
WalkerWatch
697b756435 Merge branch 'jetty-9.4.x' 2017-12-12 12:19:12 -05:00
Simone Bordet
1466aa1f75 Fixes #2017 - Documentation on ALPN needs updating. (#2045) 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-12 12:17:51 -05:00
WalkerWatch
49edcbc9df Merge branch 'jetty-9.4.x' 2017-12-12 10:40:09 -05:00
WalkerWatch
6b93a8ec9d Issue #2039 - Additional documentation. Resolves #2039. 2017-12-12 10:39:33 -05:00
Jan Bartel
c5ffca0c75 Issue #2028 Adding osgi headers for service to alpn-java client and server 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-12 06:18:44 -08:00
Greg Wilkins
142b84803e Merge remote-tracking branch 'origin/jetty-9.4.x' 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-11 12:52:20 +01:00
Zachary Duquette
65fdec0bd7 Configure jetty start timeout using JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-11 12:49:50 +01:00
Greg Wilkins
08055e1e88 Merge remote-tracking branch 'origin/jetty-9.4.x' 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-11 12:47:59 +01:00
mhow2
a5db14d0d9 Update jetty.sh (#1890) 
Real for loop. Easy to modify in case it's needed to wait longer for jetty to start (from mhow2)
 2017-12-11 12:44:35 +01:00
Simone Bordet
a116fd05a2 Merged branch 'jetty-9.4.x' into 'master'. 2017-12-11 11:50:49 +01:00
Simone Bordet
f30c02fa45 Issue #2037 - HTTP/2 stream reset leaves stream frames in the flusher. 
Simplified stream staleness checks.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-11 11:50:18 +01:00
Simone Bordet
d88e2b767f Fixes #2037 - HTTP/2 stream reset leaves stream frames in the flusher. 
Now waking up the flusher via iterate() after a reset has been received.
This ensures that frames that may have stalled are removed from the
flusher queue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-11 10:57:13 +01:00
Simone Bordet
6b7f906f9d Fixes #2034 - Improve HTTP2Session dump. 
Now the session also dumps the flusher and all the streams.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-07 22:40:57 +01:00
Simone Bordet
22308e3c1d Fixes #2035 - FlowControlStrategy keeps around reset streams. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-07 22:40:57 +01:00
WalkerWatch
76613c0999 Merge branch 'jetty-9.4.x' 2017-12-07 14:47:37 -05:00
WalkerWatch
3abbcbde65 Documentation - added note about DIGEST and MD5 2017-12-07 14:47:11 -05:00
WalkerWatch
f7601d6735 Issue #1695 Partial documentation. 2017-12-07 14:26:46 -05:00
Simone Bordet
158f90bc9e Fixes #2033 - Improve HTTP/2 session and stream stall times report. 
Now including both the past and the current stall times.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-12-07 19:21:47 +01:00
Greg Wilkins
6ca975a1aa ignore bad timestamp 2017-12-07 12:25:02 +01:00
Jan Bartel
78a2c8c6d2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-06 15:46:49 +01:00
WalkerWatch
e82649bf9d Issue #1993 - Updated maven doc. Resolves #1993. 2017-12-06 08:56:07 -05:00
Greg Wilkins
5ce07dddd6
#2006 Use a NOOP to allow unhandle to cope with stolen read (#2009) 
#2006 Use a NOOP to allow unhandle to cope with stolen read

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-02 12:14:43 +01:00
Greg Wilkins
15c0f79593
Issue #1614 made authentication extensible in request log (#2004) 
Issue #1614 made authentication extensible in request log (#2004)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-02 10:00:39 +01:00