Commit Graph

1208 Commits

Author SHA1 Message Date
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 a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07: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 a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +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 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 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 9ab2a96715 removed incorrect log.info from listener initialiser 2012-11-12 13:05:06 +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 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
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 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
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 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
Jan Bartel 0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Jan Bartel f6c1ade82f Refactor AbstractSession to remove _jdbcAttributes 2012-10-18 14:40:22 +11:00
Jan Bartel 785e06d347 390108 Servlet 3.0 API for programmatic login doesn't appear to work 2012-10-12 19:00:28 +11:00
Jan Bartel 7625f0b8b3 Merge remote-tracking branch 'origin/master' into jetty-8 2012-10-11 16:34:16 +11:00
Jesse McConnell f26b792782 [Bug 391483] fix bad javadoc example in shutdown handler 2012-10-09 15:23:01 -05:00
Jan Bartel 31807b7892 391188 Files written with Request.getPart().write(filename) should not be auto-deleted 2012-10-08 11:09:41 +11:00
Jan Bartel 36a2ed10be 391080 Multipart temp files can be left on disk from Request.getPart and getParts 2012-10-04 18:31:09 +10:00
Jan Bartel 25cdef966c 391080 Multipart temp files can be left on disk with MultiPartFilter 2012-10-04 15:24:23 +10:00
Jan Bartel e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel 0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 62322beaa9 merge from master 2012-09-10 13:14:24 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Simone Bordet 18539cd903 Reverted log call at info level back to debug level. 2012-09-10 18:05:18 +02:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins fd01a1b496 JETTY-1541 fixed different behaviour for single byte writes 2012-09-03 17:57:37 +10:00
Greg Wilkins a922d44ce0 388652 Do not flush on handle return if request is suspended 2012-09-03 13:48:17 +10:00
Thomas Becker 842f30fb87 Additional test to make sure that jetty sends a 500 response code when an exception is thrown. 2012-08-31 15:23:47 +02:00
Greg Wilkins c3844a43c9 388502 handle earlyEOF with 500 2012-08-31 19:00:42 +10:00
Thomas Becker b710701d13 HttpServerTestBase small assertion text fix 2012-08-30 16:38:43 +02:00
Thomas Becker f10729c3f8 HttpServerTestBase small assertion text fix 2012-08-30 16:13:27 +02:00
Jesse McConnell 3a0e9e1733 Merge branch 'master' into jetty-8 2012-08-30 09:09:44 -05:00
Jan Bartel c7b9081a52 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-30 16:16:44 +10:00
Thomas Becker 3c952da6ed Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-08-28 13:58:05 +02:00
Jesse McConnell cf1337264b [Bug 388073] null session id from cookie causes NPE fixed 2012-08-27 11:32:12 -05:00
Thomas Becker 77c03ad45f 388079: AbstractHttpConnection. Flush the buffer before shutting output down on error condition 2012-08-27 12:02:50 +02:00
Jesse McConnell fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Thomas Becker 9173751438 387919: throw EOFException on early eof from client on http requests 2012-08-23 19:36:49 +02:00
Jan Bartel e0276a8f65 JETTY-1515 Include cookies on 304 responses from DefaultServlet. 2012-08-20 14:52:33 +10:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jan Bartel 42583e2397 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 19:26:53 +10:00
Jan Bartel 7b61f5f04d JETTY-1501 Setting custom error response message changes page title 2012-08-03 19:22:58 +10:00
Jan Bartel c0dd05683b Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 17:25:24 +10:00
Jan Bartel 3f07564274 379423 Jetty URL Decoding fails for certain international characters 2012-08-03 17:20:58 +10:00
Greg Wilkins c998abc8bc JETTY-1527 handle requests with URIs like http://host (ie no / ) 2012-08-02 19:03:40 +10:00
Jan Bartel c67b2d89c0 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-27 16:05:15 +10:00
Jan Bartel 748f06cad7 JETTY-1529 Ensure new session that has just been authenticated does not get renewed 2012-07-27 15:31:34 +10:00
Jan Bartel 8e0dc72b23 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/pom.xml
2012-07-23 13:24:57 +10:00
Jan Bartel ea1033dddc Remove reference to unused class ClearablePrintWriter 2012-07-19 20:33:52 +10:00
Jan Bartel 3c6a6fa8e0 383304 Reset PrintWriter on response recycle
Backout changes based on jdk1.6 method and replace by nulling out AbstractHttpConnection._writer object.
2012-07-19 20:14:41 +10:00
Jan Bartel 999f66b6a8 383304 PrintWriter error flag not recycled 2012-07-19 15:32:33 +10:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 957d39da17 merge master 2012-07-16 12:51:18 -05:00
Jesse McConnell ef86919672 [Bug 385138] add getter for session path and max cookie age that seemed to disappear in a merge long ago 2012-07-16 11:38:55 -05:00
Jan Bartel b62473b58f 384896 JDBCSessionManager fails to load existing sessions on oracle when contextPath is / 2012-07-16 14:10:53 +10:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell 5222459aa7 Merge branch 'master' into jetty-8 2012-07-13 09:05:05 -05:00
Joakim Erdfelt c7825731a7 Making DNS Hijacking more evident 2012-07-13 06:46:01 -07:00
Jesse McConnell ce2dc33a0a Merge branch 'master' into jetty-8 2012-07-11 14:06:11 -05:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell 319d4bc66c quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:41:34 -05:00