? 509170-grants.patch
? 509536-misc.patch
? tests/200.png
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/README.txt,v
retrieving revision 1.61
diff -u -p -r1.61 README.txt
--- README.txt	19 Jun 2009 14:56:06 -0000	1.61
+++ README.txt	3 Jul 2009 17:08:07 -0000
@@ -872,9 +872,16 @@ Both the Domain and the Site name are re
 After you create a record, you may edit or delete it as you see fit.
 
 NOTE: As a result of module installation, you will never have a Domain with
-the domain_id of 2 if you did not use Domain Access prior to 6.x.2.0. This
+the domain_id of 1 if you did not use Domain Access prior to 6.x.2.0. This
 is by design and will not affect the module.
 
+NOTE: When editing a domain record, Domain Access runs an http request
+to see if the domain is responding properly. This test checks for the presence
+of the module's the file '200.png' inside the module's 'test' directory.
+If a 200 "found" reply is not returned, you will see an message warning you
+that your DNS may not be configured properly.  This message is intended
+to help you debug your DNS configuration and may be safely ignored.
+
 ----
 4.8 Node Settings
 
Index: domain.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v
retrieving revision 1.31
diff -u -p -r1.31 domain.admin.inc
--- domain.admin.inc	19 Jun 2009 14:56:06 -0000	1.31
+++ domain.admin.inc	3 Jul 2009 17:08:09 -0000
@@ -625,7 +625,7 @@ function domain_advanced_form($form_stat
  * An array containing the record from the {domain} table
  */
 function domain_check_response($domain) {
-  $url = domain_get_path($domain);
+  $url = domain_get_path($domain) . drupal_get_path('module', 'domain') .'/tests/200.png';
   $response = drupal_http_request($url);
   if ($response->code != 200) {
     drupal_set_message(t('%server is not responding and may not be configured correctly at the server level.
Index: domain_strict/domain_strict.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_strict/domain_strict.module,v
retrieving revision 1.7
diff -u -p -r1.7 domain_strict.module
--- domain_strict/domain_strict.module	31 May 2009 18:16:41 -0000	1.7
+++ domain_strict/domain_strict.module	3 Jul 2009 17:08:10 -0000
@@ -29,7 +29,7 @@ function domain_strict_domaingrants(&$gr
     return;
   }
   // Erase the default domain_id grants.
-  unset($grants['domain_id']);
+  $grants['domain_id'] = array();
   // Get the user-assigned domains.
   $domains = domain_get_user_domains($account);
   if (!empty($domains)) {