Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

Wizardofoddz · Apr 11, 2015 · 743d936 · 743d936
2 parents af97b5f + c15b8d9
commit 743d936
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/client/http_curl.cpp b/client/http_curl.cpp
@@ -68,12 +68,17 @@ static bool got_expectation_failed = false;
     // If we did, it's probably because we talked HTTP 1.1 to a 1.0 proxy;
     // use 1.0 from now on.
 
-char* get_user_agent_string() {
+static void get_user_agent_string() {
+    if (g_user_agent_string[0]) return;
     sprintf(g_user_agent_string, "BOINC client (%s %d.%d.%d)",
         gstate.get_primary_platform(),
         BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE
     );
-    return (char*)&g_user_agent_string;
+    if (strlen(gstate.client_brand)) {
+        char buf[256];
+        sprintf(buf, " (%s)", gstate.client_brand);
+        strcat(g_user_agent_string, buf);
+    }
 }
 
 size_t libcurl_write(void *ptr, size_t size, size_t nmemb, HTTP_OP* phop) {

diff --git a/client/http_curl.h b/client/http_curl.h
@@ -206,6 +206,4 @@ class HTTP_OP_SET {
 
 };
 
-extern char* get_user_agent_string();
-
 #endif //__HTTP_CURL_
diff --git a/doc/projects.inc b/doc/projects.inc
@@ -81,6 +81,16 @@ $dormant_projects = array(
 $biomed = array(
     tra("Biology and Medicine"),
     array(
+        array(
+            "DENIS@Home",
+            "http://denis.usj.es/denisathome/",
+            "San Jorge University, Zaragoza, Spain",
+            "Medical physiology",
+            "DENIS@Home does cardiac electrophysiological simulations, studying the electrical activity of the heart.",
+            "",
+            "",
+            "Study the physiology of the heart"
+        ),
         array(
             "RNA World",
             "http://www.rnaworld.de/rnaworld/",
@@ -311,6 +321,16 @@ $astro_phys_chem = array(
             "",
             "Study the evolution of the Universe"
         ),
+        array(
+            "Universe@Home",
+            "universeathome.pl/universe/",
+            "University of Warsaw",
+            tra("Astronomy"),
+            "Universe@Home aims to create the first database of the simulated stellar content of the Universe, from the earliest stars to the most exotic black hole binaries.",
+            "universe_at_home.png",
+            "",
+            "Do research in physics and astronomy"
+        ),
         array(
             "Milkyway@home",
             "http://milkyway.cs.rpi.edu/milkyway/",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -206,6 +206,4 @@ class HTTP_OP_SET {

		};

		extern char* get_user_agent_string();

		#endif //__HTTP_CURL_