- client: if CA bundle file isn't in BOINC directory,

don't tell Curl to look for it there.
        It might be in the default place where Curl looks.

svn path=/trunk/boinc/; revision=13150
This commit is contained in:
David Anderson 2007-07-13 17:25:47 +00:00
parent dc46bdb019
commit 6285969149
10 changed files with 40 additions and 73 deletions

View File

@ -7224,3 +7224,14 @@ David 12 July 2007
client/
sim.C,h
David 13 July 2007
- client: if CA bundle file isn't in BOINC directory,
don't tell Curl to look for it there.
It might be in the default place where Curl looks.
client/
file_names.h
http_curl.C
html/inc
stats_sites.inc

View File

@ -88,5 +88,6 @@ extern void send_log_after(const char* filename, double t, MIOFILE& mf);
#define SETPROJECTGRP_FILE_NAME "setprojectgrp"
#define TIME_STATS_LOG "time_stats_log"
#define JOB_LOG_BASE "job_log_"
#define CA_BUNDLE_FILENAME "ca-bundle.crt"
#endif

View File

@ -314,7 +314,13 @@ The checking this option controls is of the identity that the server claims. The
curlErr = curl_easy_setopt(curlEasy, CURLOPT_SSL_VERIFYPEER, 1L);
// if the above is nonzero, you need the following:
curlErr = curl_easy_setopt(curlEasy, CURLOPT_CAINFO, "ca-bundle.crt");
//
if (boinc_file_exists(CA_BUNDLE_FILENAME)) {
// call this only if a local copy of ca-bundle.crt exists;
// otherwise, let's hope that it exists in the default place
//
curlErr = curl_easy_setopt(curlEasy, CURLOPT_CAINFO, CA_BUNDLE_FILENAME);
}
// set the user agent as this boinc client & version
curlErr = curl_easy_setopt(curlEasy, CURLOPT_USERAGENT, g_user_agent_string);

View File

@ -1,6 +1,13 @@
<?
$project_news = array(
array("July 12, 2007",
"<a href=http://boinc.gorlaeus.net/>Leiden Classical</a>
is using BOINC for education - it provides a
<a href=http://boinc.gorlaeus.net/ClassicalBuilder.php>
high-performance computing resource</a> for
students of Theoretical Chemistry at Leiden University."
),
array("July 10, 2007",
"<a href=http://boinc.berkeley.edu/images/gw.jpg border=0><img align=right src=http://boinc.berkeley.edu/images/gw_small.jpg></a>
A growing number of 'skins' for the BOINC simple GUI are available

View File

@ -43,9 +43,15 @@ function download_link($pname) {
echo "
<p>
Note: BOINC may be available as a package for
for your particular Linux distribution
(Gentoo, Fedora, Debian, Ubuntu);
check this first before downloading from this page.
for your particular Linux distribution.
Check this first before downloading from this page.
Example package names:
<ul>
<li> Gentoo: sci-misc/boinc
<li> Debian and Ubuntu: boinc-client, boinc-manager
(more info <a href=http://wiki.debian.org/BOINC>here</a>).
Also boinc-dev (for project developers).
</ul>
";
}
}
@ -112,9 +118,9 @@ function show_download($pname) {
}
echo "
<p>
<a href=system_requirements.php><nobr>".tr(DL_SYSTEMREQ)."</nobr></a>
| <a href=release_notes.php><nobr>".tr(DL_RELNOTES)."</nobr></a>
| <a href=troubleshoot.php><nobr>".tr(DL_TROUBLE)."</nobr></a>
<a href=trac/wiki/SystemRequirements><nobr>".tr(DL_SYSTEMREQ)."</nobr></a>
| <a href=trac/wiki/ReleaseNotes><nobr>".tr(DL_RELNOTES)."</nobr></a>
| <a href=trac/wiki/TroubleshootClient><nobr>".tr(DL_TROUBLE)."</nobr></a>
";
if ($pname) {
//echo " | <a href=download.php?all_platforms=1><nobr>".tr(DL_OTHERSYS)."</nobr></a>

View File

@ -23,9 +23,7 @@ $type_name = $_GET["type"];
require_once("versions.inc");
if ($dev) {
$url_base = "dl/";
}
//$url_base = "dl/";
function dl_item($x, $y) {
global $light_blue;
@ -198,14 +196,6 @@ if ($xml) {
} else {
page_head("Download BOINC client software");
echo "
We are now using mirrored download servers at partner institutions.
Your download will come from a randomly-chosen server.
Thanks to these partners for their help.
<b>If you have trouble downloading a file,
please reload this page in your browser and try again.
This will link to a different download mirror and may
fix the problem.</b>
<p>
<table border=2 cellpadding=4 width=100%>
";
foreach($platforms as $short_name=>$p) {

View File

@ -1,23 +0,0 @@
<?php
require_once("docutil.php");
page_head("Running BOINC on Linux");
echo "
The BOINC client software should work on:
<ul>
<li> Any Linux version 2.0 or greater with libc version 2.2 or greater.
(If BOINC produces the error message
<pre>
boinc_client: /lib/libc.so.6: version `GLIBC_2.2' not found (required by ./boinc_client)
</pre>
then you need to install a newer version of libc.)
<li> Any Intel x86-compatible processor.
</ul>
";
page_tail();
?>

View File

@ -1,29 +0,0 @@
<?php
require_once("docutil.php");
page_head("Running BOINC on Linux x64");
echo "
The BOINC client software should work on:
<ul>
<li> Most x64 based distros.
</ul>
<p>
Note: 32-bit binaries don't just work on every 64-bit Linux.
<p>
If for example you install a fresh Ubuntu 6.10 or 7.04, 32-bit binaries won't work.
They are not even recognized as valid executables. You first have to install the ia32
package and dependent packages.
<p>
Further, for programs that link with the graphic library, you will manually have to
copy a 32-bit libglut library to the usr/lib32 directory. If after this they still get
client errors, tell them to find your exe in the projects directory and run ldd to
see what libraries are missing.
<p>
";
page_tail();
?>

View File

@ -686,7 +686,6 @@ $mac = array(
$linux = array(
"name"=>"Linux/x86",
"dbname" => "i686-pc-linux-gnu",
"url"=>"linux.php",
"versions"=>array(
$l5108,
$l5816,
@ -697,7 +696,6 @@ $linux = array(
$linuxx64 = array(
"name"=>"Linux/x64",
"dbname" => "x86_64-pc-linux-gnu",
"url"=>"linuxx64.php",
"versions"=>array(
$l5108x64,
)

View File

@ -99,7 +99,7 @@ $team_stats_sites = array(
$sig_sites = array(
array(
"http://brainsmashr.com/BOINC/",
"boincwapstats",
"BrainSmashR.com boincwapstats",
"Boincwapstats retrieves real-time BOINC statistics data
and creates signature pictures out of it.
You can select the background, style, data, etc.