Index: java/org/apache/catalina/core/StandardContext.java
===================================================================
--- java/org/apache/catalina/core/StandardContext.java	(revision 883945)
+++ java/org/apache/catalina/core/StandardContext.java	(working copy)
@@ -708,6 +708,13 @@
      */
     private boolean useHttpOnly = false;
 
+    
+    /**
+     * optional value configured to specify the default domain of
+     * the JSESSIONID cookie.
+     */
+    private String defaultCookieDomain = null;
+    
     // ----------------------------------------------------- Context Properties
 
 
@@ -5723,5 +5730,17 @@
     public boolean isStatisticsProvider() {
         return false;
     }
+
+
+	@Override
+	public String getDefaultCookieDomain() {
+		return defaultCookieDomain;
+	}
+
+
+	@Override
+	public void setDefaultCookieDomain(String defaultCookieDomain) {
+		this.defaultCookieDomain = defaultCookieDomain;		
+	}
     
 }
Index: java/org/apache/catalina/connector/Request.java
===================================================================
--- java/org/apache/catalina/connector/Request.java	(revision 883945)
+++ java/org/apache/catalina/connector/Request.java	(working copy)
@@ -180,7 +180,7 @@
 
 
     /**
-     * The preferred Locales assocaited with this Request.
+     * The preferred Locales associated with this Request.
      */
     protected ArrayList locales = new ArrayList();
 
@@ -2353,7 +2353,7 @@
                && getContext().getCookies()) {
             Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
                                        session.getIdInternal());
-            configureSessionCookie(cookie);
+            configureSessionCookie(cookie);            
             response.addCookieInternal(cookie, context.getUseHttpOnly());
         }
 
@@ -2367,7 +2367,7 @@
     }
 
     /**
-     * Configures the given JSESSIONID cookie.
+     * Configures the given JSESSIONID cookie. 
      *
      * @param cookie The JSESSIONID cookie to be configured
      */
@@ -2382,6 +2382,13 @@
         } else {
             cookie.setPath("/");
         }
+
+        if (context != null) {
+        	if (context.getDefaultCookieDomain() != null) {
+        		cookie.setDomain(context.getDefaultCookieDomain());
+        	}
+        }
+        
         if (isSecure()) {
             cookie.setSecure(true);
         }
Index: java/org/apache/catalina/Context.java
===================================================================
--- java/org/apache/catalina/Context.java	(revision 883945)
+++ java/org/apache/catalina/Context.java	(working copy)
@@ -1073,6 +1073,9 @@
      */
     public void setTldNamespaceAware(boolean tldNamespaceAware);
 
+    
+    public String getDefaultCookieDomain();
+    public void setDefaultCookieDomain(String defaultCookieDomain);
 
 }