walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ngttpx: Pass environ to execve

This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-02 23:39:14 +09:00
parent 0ee80be995
commit 70e8dc3761
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shrpx_connection_handler.cc
View File

@ -49,6 +49,8 @@
using namespace nghttp2; using namespace nghttp2;
extern char **environ;
namespace shrpx { namespace shrpx {
namespace { namespace {
@ -464,7 +466,6 @@ int ConnectionHandler::start_ocsp_update(const char *cert_file) {
const_cast<char *>( const_cast<char *>(
get_config()->tls.ocsp.fetch_ocsp_response_file.c_str()), get_config()->tls.ocsp.fetch_ocsp_response_file.c_str()),
const_cast<char *>(cert_file), nullptr}; const_cast<char *>(cert_file), nullptr};
char *const envp[] = {nullptr};
#ifdef O_CLOEXEC #ifdef O_CLOEXEC
if (pipe2(pfd, O_CLOEXEC) == -1) { if (pipe2(pfd, O_CLOEXEC) == -1) {
@ -515,7 +516,7 @@ int ConnectionHandler::start_ocsp_update(const char *cert_file) {
dup2(pfd[1], 1); dup2(pfd[1], 1);
close(pfd[0]); close(pfd[0]);
rv = execve(argv[0], argv, envp); rv = execve(argv[0], argv, environ);
if (rv == -1) { if (rv == -1) {
auto error = errno; auto error = errno;
LOG(ERROR) << "Could not execute ocsp query command: " << argv[0] LOG(ERROR) << "Could not execute ocsp query command: " << argv[0]