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
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8403940eafd65042f05c3dd0c51a103d97139571
diff --git a/google/platform_utils_linux.py b/google/platform_utils_linux.py
index a735111..db47dc2 100644
--- a/google/platform_utils_linux.py
+++ b/google/platform_utils_linux.py
@@ -90,6 +90,7 @@
"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 @@
' -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/google/platform_utils_mac.py b/google/platform_utils_mac.py
index c4399b3..6603a41 100644
--- a/google/platform_utils_mac.py
+++ b/google/platform_utils_mac.py
@@ -90,6 +90,7 @@
"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 @@
' -C \'ServerRoot "%(server_root)s"\''
' -c \'LockFile "%(lock_file)s"\''
' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\''
+ ' -c \'SSLMutex "%(ssl_mutex)s"\''
)
if document_root:
