Merge pull request #6176 from BOINC/dpa_www2

Author: AenBleidd

client/client_state.cpp

@@ -1267,22 +1267,29 @@ bool CLIENT_STATE::poll_slow_events() {
 #endif // ifndef SIM
 
 // Find the project with the given master_url.
-// Ignore differences in protocol, case, and trailing /
+// Ignore differences in protocol, case, leading 'www.', and trailing /
+// (the URL could come from an account manager,
+// with differences from the real URL)
 //
 PROJECT* CLIENT_STATE::lookup_project(const char* master_url) {
     char buf[256];
 
     safe_strcpy(buf, master_url);
     canonicalize_master_url(buf, sizeof(buf));
-    char* p = strstr(buf, "//");
+    const char* p = strstr(buf, "//");
     if (!p) return NULL;
+    p += 2;
+    if (strcasestr(p, "www.") == p) p += 4;
+    strcpy(buf, p);
 
-    for (unsigned int i=0; i<projects.size(); i++) {
-        char* q = strstr(projects[i]->master_url, "//");
+    for (PROJECT *project: projects) {
+        const char* q = strstr(project->master_url, "//");
         if (!q) continue;
-        if (!strcasecmp(p, q)) {
+        q += 2;
+        if (strcasestr(q, "www.") == q) q += 4;
+        if (!strcasecmp(buf, q)) {
             // note: canonicalize_master_url() doesn't lower-case
-            return projects[i];
+            return project;
         }
     }
     return 0;

lib/url.cpp

@@ -203,7 +203,6 @@ void escape_url_readable(char *in, char* out) {
 // Canonicalize a master url.
 //   - Prepend http:// if protocol missing
 //   - Remove double slashes in the rest
-//   - strip leading 'www.'
 //   - Add a trailing slash if necessary
 //   - Convert all alphabetic characters to lower case
 //
@@ -220,11 +219,6 @@ void canonicalize_master_url(char* url, int len) {
         strlcpy(buf, url, sizeof(buf));
     }
 
-    // strip leading www.
-    //
-    if (strstr(buf, "www.") == buf) {
-        strcpy(buf, buf+4);
-    }
     while (1) {
         p = strstr(buf, "//");
         if (!p) break;