diff options
| author | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-05 17:49:46 +0000 |
|---|---|---|
| committer | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-05 17:49:46 +0000 |
| commit | 8403940eafd65042f05c3dd0c51a103d97139571 (patch) | |
| tree | 78ed09043a2d7e11098b6f6a15ec5fdde56163e5 /tools/python/google | |
| parent | 7c9e492d6c30e171cf2dc5f86735fa6c8338460c (diff) | |
| download | chromium_src-8403940eafd65042f05c3dd0c51a103d97139571.zip chromium_src-8403940eafd65042f05c3dd0c51a103d97139571.tar.gz chromium_src-8403940eafd65042f05c3dd0c51a103d97139571.tar.bz2 | |
Adding SSL mutex specification to a local file, to stop relying on a mutable
directory in the root.
TEST=Locally on a bot like machine (no prior fix). Try bots (with chmod /var/run).
BUG=none
Review URL: http://codereview.chromium.org/5617004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/python/google')
| -rw-r--r-- | tools/python/google/platform_utils_linux.py | 2 | ||||
| -rw-r--r-- | tools/python/google/platform_utils_mac.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/python/google/platform_utils_linux.py b/tools/python/google/platform_utils_linux.py index a735111..db47dc2 100644 --- a/tools/python/google/platform_utils_linux.py +++ b/tools/python/google/platform_utils_linux.py @@ -90,6 +90,7 @@ class PlatformUtility(object): "server_root": os.path.join(self._UnixRoot(), "usr"), "mime_types_path": mime_types_path, "output_dir": output_dir, + "ssl_mutex": "file:"+os.path.join(output_dir, "ssl_mutex"), "user": os.environ.get("USER", "#%d" % os.geteuid()), "lock_file": os.path.join(output_dir, "accept.lock"), } @@ -112,6 +113,7 @@ class PlatformUtility(object): ' -C \'ServerRoot "%(server_root)s"\'' ' -c \'LockFile "%(lock_file)s"\'' ' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\'' + ' -c \'SSLMutex "%(ssl_mutex)s"\'' ) if document_root: diff --git a/tools/python/google/platform_utils_mac.py b/tools/python/google/platform_utils_mac.py index c4399b3..6603a41 100644 --- a/tools/python/google/platform_utils_mac.py +++ b/tools/python/google/platform_utils_mac.py @@ -90,6 +90,7 @@ class PlatformUtility(object): "server_root": os.path.join(self._UnixRoot(), "usr"), "mime_types_path": mime_types_path, "output_dir": output_dir, + "ssl_mutex": "file:"+os.path.join(output_dir, "ssl_mutex"), "user": os.environ.get("USER", "#%d" % os.geteuid()), "lock_file": os.path.join(output_dir, "accept.lock"), } @@ -112,6 +113,7 @@ class PlatformUtility(object): ' -C \'ServerRoot "%(server_root)s"\'' ' -c \'LockFile "%(lock_file)s"\'' ' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\'' + ' -c \'SSLMutex "%(ssl_mutex)s"\'' ) if document_root: |