Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,642 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

1858 Commits

Author SHA1 Message Date
Greg Wilkins 03fd068ebc Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
 2013-04-22 14:20:03 +10:00
Greg Wilkins db48bce49d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-22 14:15:51 +10:00
Greg Wilkins 3c498f0a2c 405281 allow filemappedbuffers to not be used 2013-04-22 14:15:14 +10:00
Greg Wilkins a275c8fb37 Merge branch 'master' into servlet-3.1-api 2013-04-22 12:10:13 +10:00
Greg Wilkins c3325e8b04 405530 Wrap AsyncContext to throw ISE after complete 2013-04-22 11:33:44 +10:00
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Greg Wilkins f9f2a2c405 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-19 13:56:34 +10:00
Greg Wilkins 22c3151ad6 added some more properties to the configuration 2013-04-18 17:05:03 +10:00
Jan Bartel d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +10:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel db21b42b4f Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds). 2013-04-15 17:44:35 +10:00
Greg Wilkins a03a5c340b 405540 ServletContextListeners call in reverse in doStop 2013-04-15 14:31:41 +10:00
Greg Wilkins 4e3c7367af virtual host example 2013-04-15 12:29:08 +10:00
Simone Bordet de7adaf0d2 Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented. 2013-04-12 13:58:31 +02:00
Jan Bartel 07b844bf85 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-11 15:55:04 +10:00
Greg Wilkins 9bb0260410 improved shutdown handling for travis CI 2013-04-11 12:01:01 +10:00
Greg Wilkins 4c04f5dd40 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-04-11 11:46:07 +10:00
Greg Wilkins e8d9625dcc adjust tests to make them more travis CI compatible 2013-04-11 08:33:28 +10:00
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Greg Wilkins 44ec0b3f49 403360 Named connectors 2013-04-08 09:25:54 +10:00
Greg Wilkins 5d451e5fec Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-04-05 08:31:48 +11:00
Greg Wilkins 1191142c97 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
 2013-04-05 08:31:31 +11:00
Simone Bordet 72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Greg Wilkins e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins 3cd6d90e9f removed verbose output 2013-04-04 15:38:15 +11:00
Jan Bartel 7523c5234c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-jsp/pom.xml
 2013-04-04 13:31:33 +11:00
Simone Bordet b312fffd7e 402666 - Improve handling of TLS exceptions due to raw socket close. 2013-03-29 16:57:05 +01:00
Greg Wilkins 5b3d866a27 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-28 16:03:34 +11:00
Greg Wilkins 7db1b36be9 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
 2013-03-28 15:04:42 +11:00
Jan Bartel af5f8aac33 403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy 2013-03-28 15:02:33 +11:00
Greg Wilkins 1f9e4f3e5c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-28 14:05:24 +11:00
Greg Wilkins 72162c0342 404517 Close connection if request received after half close 2013-03-28 14:04:24 +11:00
Greg Wilkins fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Jan Bartel 370df6e723 404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified 2013-03-26 23:45:28 +11:00
Greg Wilkins 108a8e9dca 404326 set status when Request.setHandled(true) is called 2013-03-26 23:36:31 +11:00
Greg Wilkins 8c405f4503 404323 Improved parameterization of https and SPDY 2013-03-26 16:29:48 +11:00
Greg Wilkins 9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Greg Wilkins 6c9f090479 removed System.outs 2013-03-22 11:34:11 +11:00
Jan Bartel bcdf071a9c 404067 If cannot connect to db fail startup of JDBCSessionIdManager 2013-03-22 10:00:05 +11:00
Jan Bartel 7c2321b9d4 403510 HttpSession maxInactiveInterval is not serialized in HashSession 2013-03-21 12:23:52 +11:00
Greg Wilkins b2f3a05503 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-21 09:24:02 +11:00
Joakim Erdfelt bb7a1d4ca6 396562 - Add an implementation of RequestLog that supports Slf4j 2013-03-20 13:17:14 -07:00
Joakim Erdfelt a4d3740900 Merge branch 'jetty-8' -> 'master' 2013-03-18 12:34:57 -07:00
Jan Bartel 279dff381c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-osgi/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
 2013-03-18 16:00:23 +11:00
Greg Wilkins 8514e8452b 403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 15:37:00 +11:00
Jan Bartel b69b52d984 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 15:27:10 +11:00
Jan Bartel 25f5e38e13 403513 jetty:run goal cannot be executed twice during the maven build 2013-03-18 14:33:49 +11:00
Greg Wilkins 5f1980f408 merged unsafe blocking Q, removed unsafe usage and usage of Q 2013-03-18 13:27:37 +11:00
Greg Wilkins ba9d70589a Merge branch 'master' into unsafe 2013-03-18 12:02:37 +11:00
Greg Wilkins 47bf3eef0c use async request log by default 2013-03-18 11:09:50 +11:00
Greg Wilkins e8d76ef12c Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
	jetty-server/src/main/config/etc/jetty-requestlog.xml
	jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
	jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
	jetty-servlets/pom.xml
 2013-03-18 11:09:13 +11:00
Greg Wilkins d21c8e5ca4 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 10:53:14 +11:00
Greg Wilkins 63f2719938 403570 Asynchronous Request Logging 2013-03-18 10:48:06 +11:00
Jan Bartel b15f9340d0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-15 14:40:19 +11:00
Jan Bartel 41feea7e01 402844 STOP.PORT & STOP.KEY behaviour has changed 2013-03-15 14:38:53 +11:00
Greg Wilkins c577783fa6 inject new Q into ThreadPool 2013-03-15 12:30:49 +11:00
Joakim Erdfelt 8a96cc8c4a Merge branch 'jetty-7' into jetty-8 2013-03-14 16:54:35 -07:00
Joakim Erdfelt 5084a1430f Fixing build. 
+ Bumping jetty-test-helper to 2.0
 + Bumping jetty-version-maven-plugin to 1.0.10
 + Fixing JDK 1.5 build warts
 + Updating Stress use for new "test.stress" property introduced by upgrades
 2013-03-14 16:52:52 -07:00
Thomas Becker 93efdcf080 384552 add comment to jetty-https.xml describing keymanager password 2013-03-14 11:23:55 +01:00
Greg Wilkins 29b83dff9b 402626 Do not required endpoint host checking by default 2013-03-14 09:25:28 +11:00
Jesse McConnell acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell 0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell 852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jan Bartel 0834ad259c 402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry 2013-03-11 19:31:39 +11:00
Greg Wilkins 11442814fa Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-03-11 17:23:54 +11:00
Joakim Erdfelt bbf44a5d32 Merge branch 'release-9' 2013-03-09 06:16:25 -07:00
Joakim Erdfelt 897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Jan Bartel f1cd726ba2 Merge remote-tracking branch 'origin/jetty-8' 2013-03-08 14:27:24 +11:00
Jan Bartel 9055132144 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-08 13:45:56 +11:00
Jan Bartel 57cff606fd 400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs 2013-03-08 13:33:48 +11:00
Joakim Erdfelt 7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Greg Wilkins b7aded6e55 392129 fixed merged of handling of timeouts after startAsync 2013-03-08 11:22:07 +11:00
Greg Wilkins ae7248b6d2 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
 2013-03-08 11:21:05 +11:00
Greg Wilkins face3b3584 392129 fixed handling of timeouts after startAsync 2013-03-08 09:35:08 +11:00
Jan Bartel f714504acc Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
 2013-03-07 12:56:42 +11:00
Jan Bartel 621b1489e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 12:17:20 +11:00
Jan Bartel a636fbfe7b 400142 ConcurrentModificationException in JDBC SessionManger 
As part of this fix, refactored the JDBCSession to remove the SessionData object.
 2013-03-07 12:02:27 +11:00
Greg Wilkins e283d72f25 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
 2013-03-07 09:09:23 +11:00
Greg Wilkins 60a6340f8f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 08:36:23 +11:00
Greg Wilkins 1e0b9d4d97 402485 reseed secure random 2013-03-07 08:34:42 +11:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Greg Wilkins 0f415a735a 399799 do not hold lock while calling invalidation listeners 2013-03-05 17:05:50 +11:00
Greg Wilkins 0c941a878d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-05 14:42:55 +11:00
Greg Wilkins 777817dd0f 399799 do not hold lock while calling invalidation listeners 2013-03-05 14:32:17 +11:00
Greg Wilkins 3bc0411e65 401904 fixed getRemoteAddr to return IP instead of hostname 2013-03-04 17:10:27 +11:00
Greg Wilkins 8933a8bdca less verbose exception 2013-03-04 16:22:03 +11:00
Greg Wilkins 7d7769475c removed printStackTrace 2013-03-04 15:44:30 +11:00
Greg Wilkins 663b45770a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-02 12:56:06 +11:00
Jan Bartel afbf98bd88 Merge remote-tracking branch 'origin/jetty-8' 2013-03-02 10:29:15 +11:00
Jan Bartel 3ed3dfc7a1 402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped 2013-03-02 10:12:24 +11:00
Greg Wilkins 6478306812 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
 2013-03-02 09:32:57 +11:00
Simone Bordet e6fed09129 402075 - Massive old gen growth when hit by lots of non persistent connections. 
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
 2013-03-01 15:19:51 +01:00
Greg Wilkins 41952ebf1d 402075 Dont allocate the parser trie unless needed 2013-03-01 22:16:54 +11:00
Jan Bartel bf154404fe 402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped 2013-03-01 19:58:44 +11:00
Jan Bartel 90b5ea2c5e Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-03-01 19:08:09 +11:00
Jan Bartel caa0199efe 400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup 2013-03-01 18:09:19 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Greg Wilkins 859710c2c5 401643 Improved Authentication exception messages and provided quiet servlet exception 2013-02-25 13:59:56 +11:00
Greg Wilkins 6d850146fb jetty-9 fixed error from doco change 2013-02-24 09:27:05 +11:00
Greg Wilkins 0671514e34 jetty-9 fixed error from doco change 2013-02-24 09:15:40 +11:00
Greg Wilkins 999db7f4d8 refined jetty embedded examples 2013-02-22 16:19:06 +11:00
Greg Wilkins c302a404cd refined jetty embedded examples 2013-02-22 15:51:17 +11:00
Greg Wilkins b82a781113 400864 Added LowResourcesMonitor 2013-02-18 20:03:36 +11:00
Joakim Erdfelt f15d4c0376 400738 - ResourceHandler doesn't support range requests 
+ Adding testcase to replicate issue.
 2013-02-13 14:27:26 -07:00
Simone Bordet 6d0f233c80 362854 - Continuation implementations may deadlock. 
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
 2013-02-13 16:00:40 +01:00
Simone Bordet ef81982579 400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException. 
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
 2013-02-13 12:03:31 +01:00
Jesse McConnell e09d401fd2 add configuration option to not send server version 2013-02-12 10:08:56 -06:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Jesse McConnell 3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Jesse McConnell a086451bc7 [Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory 2013-01-28 16:15:34 -06:00
Thomas Becker 988206c36a 393968 fix typo in javadoc 2013-01-28 16:11:33 +01:00
Jesse McConnell 2cbb630f8e Merge branch 'jetty-8' 2013-01-25 16:53:46 -06:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell a7c074a86c merge from jetty-8 2013-01-25 15:32:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Greg Wilkins ff350c3740 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-25 11:46:03 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +11:00
Greg Wilkins fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-24 14:30:45 +11:00
Greg Wilkins 161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 3a0291929c removed some TODOs 2013-01-11 23:53:26 +11:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins e6d3397c1c jetty-9 removed alias option 2013-01-11 08:50:09 +11:00
Greg Wilkins 25324b666c jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space 2013-01-10 17:31:57 +11:00
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-10 16:24:41 +11:00
Greg Wilkins 3cba027390 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
 2013-01-08 09:13:39 +11:00
Greg Wilkins 64ed66db8b Remove test needing java 7 2013-01-08 09:12:08 +11:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
 2013-01-07 23:45:38 +11:00
Jan Bartel 96fd7dc562 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-01-07 20:12:49 +11:00
Jan Bartel 3265c334cb 397130 maxFormContentSize set in jetty.xml is ignored 2013-01-07 20:10:54 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Joakim Erdfelt 4037e6111f 395885 - ResourceCache should honor useFileMappedBuffer if set 2013-01-02 14:47:02 -07:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel aa3b829fb1 Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions" 
This reverts commit 72cdab4934.
 2012-12-24 14:11:15 +11:00
Jan Bartel 37ac5e7b16 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2012-12-22 16:42:33 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
 2012-12-22 15:12:17 +11:00
Greg Wilkins d4c4637f4d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-22 12:30:20 +11:00
Greg Wilkins 810ff3802f 397110 Accept %uXXXX encodings in URIs 2012-12-22 12:00:54 +11:00
Jan Bartel 191040b736 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-21 14:00:13 +11:00
Jan Bartel 32e1d0f29c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
 2012-12-21 13:00:14 +11:00
Joakim Erdfelt 5e4711fdb0 Fixing confusing output 2012-12-20 17:32:34 -07:00
Joakim Erdfelt a371a8963d Fixing NPE 2012-12-20 17:30:46 -07:00
Joakim Erdfelt b65973afdd Bug 391623 - Add option to --stop to wait for target jetty to stop 
* Reworked ShutdownMonitor to better support multiple servers +
  jetty-maven-plugin requirements.
 2012-12-20 15:32:36 -07:00
Joakim Erdfelt 69b9856998 Squashing JMX warnings on jetty startup 2012-12-19 13:50:51 -07:00
Joakim Erdfelt a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07:00
Thomas Becker 72cdab4934 395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions 2012-12-18 13:09:21 +01:00
Greg Wilkins 3ce8c2ba58 jetty-9 recycle response print writers 2012-12-17 16:02:06 +11:00
Jan Bartel 2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11:00
Greg Wilkins c87ebcb4a5 jetty-9 avoid additional dispatch for pipelined requests to optimize pipeline handling 2012-12-17 11:35:26 +11:00
Greg Wilkins ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00
Jan Bartel f9e76b1620 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
 2012-12-14 11:48:55 +11:00
Greg Wilkins 6bfc19be1b jetty-9 optimisation to dispatch before parsing so that handling is done in same thread 2012-12-14 09:50:22 +11:00
Greg Wilkins 5b8a9bb95e jetty-9 use spare space in content buffer for header 2012-12-14 08:30:46 +11:00
Greg Wilkins e5679d42c0 jetty-9 use spare space in content buffer for header 2012-12-14 07:41:22 +11:00
Jan Bartel 08a7cd86e3 Revert "jetty-9 added null constructor" 2012-12-13 20:17:25 +11:00
Greg Wilkins 0c16c774ca jetty-9 use spare space in content buffer for header 2012-12-13 18:49:54 +11:00
Greg Wilkins a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +11:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins f01da31a0a jetty-9 some optimizations 2012-12-08 01:41:01 +11:00
Greg Wilkins 620d051087 jetty-9 recycle content-type 2012-12-08 01:41:01 +11:00
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Joakim Erdfelt 7abd512b32 391623 - Making --stop with STOP.WAIT perform graceful shutdown 
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
  using ShutdownThread to perform a graceful shutdown instead.
 2012-12-04 10:18:54 -07:00
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
 2012-11-30 15:45:36 +11:00
Greg Wilkins 9931ddec94 jetty-9 fixed test webapp TestServer and improved error message 2012-11-29 17:03:40 +11:00
Jan Bartel 9f5801c3fd 395215 Multipart mime with just LF and no CRLF 2012-11-29 15:57:16 +11:00
Greg Wilkins 16844eafc5 jetty-9 javadoc 2012-11-29 13:29:24 +11:00
Greg Wilkins 0805f131a8 jetty-9 added null constructor 2012-11-29 10:10:53 +11:00
Greg Wilkins 9a4e5f3301 jetty-9 Added proxy test webapp. Refined no servlet context handling 2012-11-26 16:57:37 +11:00
Jan Bartel 0eeef6ab4e 393770 Error in ContextHandler.setEventListeners(EventListener[]) 2012-11-26 11:09:21 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Jan Bartel ba8057867e Merge remote-tracking branch 'origin/jetty-8' 2012-11-23 15:04:20 +11:00
Jan Bartel 8241089364 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-23 14:45:34 +11:00
Jan Bartel 769260f251 392417 Prevent Cookie parsing interpreting unicode chars 2012-11-23 12:29:53 +11:00
Greg Wilkins 7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Greg Wilkins f0cc03ede5 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.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/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
 2012-11-22 17:01:55 +11:00
Greg Wilkins e42b5bf970 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:35:26 +11:00
Jan Bartel 90a86d3a6b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:26:38 +11:00
Greg Wilkins 14162c6154 394514 Preserve URI parameters in sendRedirect 2012-11-22 16:10:19 +11:00
Jan Bartel 8920fcc128 394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session 2012-11-22 15:50:01 +11:00
Greg Wilkins 139de22bc0 394370 correctly handle last content and responses with no content 2012-11-16 12:42:52 +11:00
Greg Wilkins 49de22ea48 jetty-9 improved javadoc 2012-11-15 17:31:43 +11:00
Simone Bordet f35f32ac48 Eliminated jetty-proxy module. 
Moved ConnectHandler to jetty-server and ProxyServlet to jetty-servlets.
 2012-11-13 17:11:46 +01:00
Simone Bordet ba40f7897d Completed port of ConnectHandler and ProxyServlet implementations. 2012-11-13 15:35:51 +01:00
Greg Wilkins d72feaa941 jetty-9 javadoc improvement 2012-11-13 07:59:53 +11:00
Greg Wilkins 650ce2be66 jetty-9 javadoc improvement 2012-11-13 07:30:49 +11:00
Simone Bordet cf4c5e6024 Added getter for the request buffer; this is needed by the ConnectHandler 
to transfer pipelined requests that are present after the CONNECT.

Modified the logic to make the generator persistent to take in account
also the method: if it's a CONNECT, then the generator is always persistent.
 2012-11-12 19:07:36 +01:00
Greg Wilkins 9ab2a96715 removed incorrect log.info from listener initialiser 2012-11-12 13:05:06 +11:00
Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
 2012-11-12 12:30:26 +11:00
Greg Wilkins 3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
 2012-11-12 09:08:53 +11:00
Greg Wilkins 75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +11:00
Greg Wilkins a1d0efc2bb 393832 start connectors last 2012-11-08 19:30:58 +11:00
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
 2012-11-08 14:58:10 +11:00
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	VERSION.txt
 2012-11-08 14:41:01 +11:00
Greg Wilkins e615504889 392492 expect headers only examined for requests>=HTTP/1.1 2012-11-08 14:37:07 +11:00
Jan Bartel 8e47864bcf 392850 ContextLoaderListener not called in 9.0.0.M1 and M2 2012-11-08 14:02:35 +11:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jan Bartel 2acdf9f839 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
	jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
 2012-11-05 17:27:49 +11:00
Jan Bartel f3af8c8650 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-05 16:28:25 +11:00
Jan Bartel fff825a997 393494 HashSessionManager can't delete unrestorable sessions on Windows 2012-11-05 16:26:20 +11:00
Jan Bartel 2a2215cf0b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-11-02 16:59:11 +11:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
 2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jan Bartel c49563244c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-10-30 19:18:20 +11:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Jan Bartel b8d6b4da8b Making session tests work; incorporating renewing session id keeping old object. 2012-10-27 18:44:35 +11:00
Jan Bartel 1ee6fe4cba Change session renewal to be in line with servlet3.1; make session tests work; fix mongo session manager (scavenging) 2012-10-27 17:38:43 +11:00
Jan Bartel b496962a4a SERVLET_SPEC-27 2012-10-27 17:38:43 +11:00
Jan Bartel 276fea25b8 Add comments 2012-10-27 17:38:43 +11:00
Jan Bartel 958d0c6949 Start incorporating (EDR version) servlet 3.1 spec 2012-10-27 17:38:43 +11:00
Greg Wilkins 7d93f4b228 392237 more debug 2012-10-26 15:31:19 +11:00
Greg Wilkins 63f2db2242 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
 2012-10-26 09:43:05 +11:00
Jan Bartel e93aa7d42c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-26 09:39:53 +11:00
Jan Bartel 8a9d25a48b 392641 JDBC Sessions not scavenged if expired during downtime 2012-10-26 09:26:40 +11:00
Greg Wilkins c51cabccc1 392237 moved HttpTransport towards asynchronous solution 2012-10-25 23:28:32 +11:00
Greg Wilkins bf7a0ace22 392237 Added BlockingCallback optimisation 2012-10-25 22:36:13 +11:00
Greg Wilkins 18f7293efd 392237 Fixed 3.0 port of chat servlet 2012-10-25 12:27:30 +11:00
Greg Wilkins ce46d39eb0 392237 javadoc 2012-10-22 15:17:18 +11:00