Commit Graph

11917 Commits

Author SHA1 Message Date
Greg Wilkins 77064b5065 Merge pull request #368 from o/patch-1
Fix typo in annotation
2016-02-26 18:56:20 +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
Joakim Erdfelt cfc2dc2b01 Merge branch 'jetty-9.3.x' 2016-02-26 08:22:39 -07:00
Joakim Erdfelt aed05a1e36 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-02-26 08:22:12 -07:00
Jesse McConnell 1a1a8dd806 clean javadoc 2016-02-26 08:11:59 -07:00
Jesse McConnell c74b0c23e9 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:11:27 -07:00
Jesse McConnell b08f177d47 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:09:12 -07:00
Jesse McConnell 931f67baab Update index.html 2016-02-26 08:08:17 -07:00
Jesse McConnell 7fab31e309 Update index.html 2016-02-26 08:08:16 -07:00
Jesse McConnell e46a19bde0 Update index.html 2016-02-26 08:08:16 -07:00
Jesse McConnell aaba9eca42 Update index.html 2016-02-26 08:08:16 -07:00
Jesse McConnell b62b2d3426 Update pom.xml 2016-02-26 08:08:12 -07:00
Jesse McConnell 019e9174b9 Update pom.xml 2016-02-26 08:07:20 -07:00
Jesse McConnell 850707e965 Update ExampleServerXml.java 2016-02-26 08:07:20 -07:00
Jesse McConnell 54e92d88c4 Update FileServerXml.java 2016-02-26 08:07:19 -07:00
Jesse McConnell d8f74233a0 fix some merge issues, some example javadoc that was never right and contributing language 2016-02-26 08:13:41 -06:00
Jesse McConnell fc73be1d31 clean javadoc 2016-02-26 08:09:15 -06:00
Jesse McConnell ce5a3b11d6 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:03:33 -06:00
Jesse McConnell 76b34fe79a Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 07:51:05 -06:00
Jesse McConnell 881edcb640 Update index.html 2016-02-26 07:34:33 -06:00
Jesse McConnell ad8733e5ab Update index.html 2016-02-26 07:33:44 -06:00
Jesse McConnell d0e8d5af2f Update index.html 2016-02-26 07:33:16 -06:00
Jesse McConnell 6e41a267ef Update index.html 2016-02-26 07:32:41 -06:00
Jesse McConnell dcfec2b6ee Update pom.xml 2016-02-26 07:31:36 -06:00
Jesse McConnell 12b6ecfead Update pom.xml 2016-02-26 07:31:09 -06:00
Jesse McConnell b3dc23f2c0 Update ExampleServerXml.java 2016-02-26 07:30:14 -06:00
Jesse McConnell 74f8abf8af Update FileServerXml.java 2016-02-26 07:29:22 -06:00
Jesse McConnell 49da7397b5 Update CONTRIBUTING.md 2016-02-26 07:27:19 -06:00
Simone Bordet 7938c9f86f Merged branch 'jetty-9.3.x' into 'master'. 2016-02-26 10:37:47 +01:00
Simone Bordet 50422a1a1f Replaced usages of Random with ThreadLocalRandom in concurrent code. 2016-02-26 10:29:58 +01:00
Jan Bartel eb5e25ce1e Fix javadoc comments 2016-02-24 17:58:18 +01:00
Greg Wilkins ebfb45dd70 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-24 15:18:47 +01:00
Simone Bordet 83baed0bfe Reformatted code. 2016-02-24 15:06:08 +01:00
Greg Wilkins 7b6c1af4a7 Removed extra ByteBuffer duplicate 2016-02-24 13:47:35 +01:00
Greg Wilkins 1eeecdaee5 Issue #355 Improve close behaviour
Inverted the logic of the handling of exceptions thrown in CommitCallback.
Now only if a BadMessageException is throw do we attempt to write a 500 response.
All other exceptions just abort the connection
2016-02-24 13:36:06 +01:00
Greg Wilkins aa7fd02c5f Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-23 18:31:15 +01:00
Greg Wilkins c3a54e9d0b fixed javadoc 2016-02-23 18:23:23 +01:00
Greg Wilkins 3c671aa8b6 Issue #346 HttpParser RFC2616 Compliance mode
Reimplmented HTTP/0.9 support in RFC2616 compliance mode
2016-02-23 17:33:53 +01:00
Jan Bartel 21fdaf500e Merge remote-tracking branch 'origin/jetty-9.3.x'
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
2016-02-23 14:04:06 +01:00
Jan Bartel 750b74ad49 Add comments to session implemention code 2016-02-23 13:47:56 +01:00
Simone Bordet 76689dd303 Issue #354 (Spin loop in case of exception thrown during accept()).
Fixed by introducing an overridable method that performs an arbitrary
sleep to avoid the spin loop. Subclasses may customize.
2016-02-23 11:37:08 +01:00
Jan Bartel ef6d0194b9 Issue #352 Integrate session idling for MongoSessionManager 2016-02-22 15:11:54 +01:00
Simone Bordet c52c8304d8 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-22 11:34:07 +01:00
Simone Bordet 89ead7561e Issue #285 (PathContentProvider - Use of Direct buffers without pooling).
Introduced PathContentProvider.setByteBufferPool() so that a buffer
pool can be set (for example from HttpClient.getByteBufferPool()).
If present, PathContentProvider will use it.
2016-02-22 11:33:23 +01:00
Simone Bordet a4889eee6b Merged branch 'jetty-9.3.x' into 'master'. 2016-02-19 16:51:47 +01:00
Simone Bordet a57f8d0517 Updated the certificate to make the test pass with the latest JDKs. 2016-02-19 16:51:23 +01:00
Simone Bordet 2e62bca2ea Issue #251 (Consider removing SSLEngine.beginHandshake() calls).
Removed SSLEngine.beginHandshake() calls.
2016-02-19 16:33:55 +01:00
Simone Bordet e09396db4e Issue #298 (qtp threads spin-locked in MBeanContainer.beanAdded).
Replaced WeakHashMap with ConcurrentMap.
The "weak" features of WHM were not used anyway.
2016-02-19 16:32:44 +01:00
Simone Bordet 51009208d4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-19 13:23:34 +01:00
Simone Bordet df32714e8d Issue #344 (init script does not properly display status of a non running service). 2016-02-19 12:36:50 +01:00