~ubuntu-branches/ubuntu/natty/lighttpd/natty

« back to all changes in this revision

Viewing changes to src/mod_cgi.c

Committer: Bazaar Package Importer
Author(s): Krzysztof Krzyżaniak (eloy)
Date: 2009-10-30 17:37:29 UTC
mto: (6.1.4 squeeze)
mto: This revision was merged to the branch mainline in revision 50.
Revision ID: james.westby@ubuntu.com-20091030173729-ehmsdiba9nkcd0j7

Tags: upstream-1.4.24

Import upstream version 1.4.24

files added:
m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

tests/docroot/www/sendfile.php

files removed:
ChangeLog

files modified:
Makefile.am

Makefile.in

NEWS

SConstruct

aclocal.m4

autogen.sh

compile

config.guess

config.h.in

config.sub

configure

configure.ac

depcomp

doc/Makefile.in

doc/fastcgi.txt

install-sh

missing

src/Makefile.am

src/Makefile.in

src/array.c

src/array.h

src/base.h

src/bitset.c

src/buffer.c

src/buffer.h

src/chunk.c

src/configfile-glue.c

src/configfile.c

src/configparser.c

src/configparser.y

src/connections.c

src/crc32.h

src/data_array.c

src/data_config.c

src/data_count.c

src/data_fastcgi.c

src/data_integer.c

src/data_string.c

src/etag.c

src/etag.h

src/fdevent.c

src/fdevent.h

src/fdevent_freebsd_kqueue.c

src/fdevent_linux_rtsig.c

src/fdevent_linux_sysepoll.c

src/fdevent_poll.c

src/fdevent_select.c

src/fdevent_solaris_devpoll.c

src/http-header-glue.c

src/http_auth.c

src/http_auth_digest.c

src/http_auth_digest.h

src/http_chunk.c

src/inet_ntop_cache.c

src/joblist.c

src/keyvalue.c

src/keyvalue.h

src/lemon.c

src/log.c

src/md5.c

src/mod_access.c

src/mod_accesslog.c

src/mod_alias.c

src/mod_auth.c

src/mod_cgi.c

src/mod_cml.c

src/mod_cml_funcs.c

src/mod_cml_funcs.h

src/mod_cml_lua.c

src/mod_compress.c

src/mod_dirlisting.c

src/mod_evasive.c

src/mod_evhost.c

src/mod_expire.c

src/mod_extforward.c

src/mod_fastcgi.c

src/mod_flv_streaming.c

src/mod_indexfile.c

src/mod_magnet.c

src/mod_magnet_cache.c

src/mod_mysql_vhost.c

src/mod_proxy.c

src/mod_redirect.c

src/mod_rewrite.c

src/mod_rrdtool.c

src/mod_scgi.c

src/mod_secure_download.c

src/mod_setenv.c

src/mod_simple_vhost.c

src/mod_skeleton.c

src/mod_ssi.c

src/mod_ssi_expr.c

src/mod_ssi_exprparser.c

src/mod_ssi_exprparser.y

src/mod_staticfile.c

src/mod_status.c

src/mod_trigger_b4_dl.c

src/mod_userdir.c

src/mod_usertrack.c

src/mod_webdav.c

src/network.c

src/network_backends.h

src/network_freebsd_sendfile.c

src/network_linux_sendfile.c

src/network_openssl.c

src/network_solaris_sendfilev.c

src/network_write.c

src/network_writev.c

src/plugin.c

src/proc_open.c

src/request.c

src/response.c

src/response.h

src/server.c

src/settings.h

src/splaytree.c

src/stat_cache.c

src/status_counter.c

src/status_counter.h

src/stream.c

src/version.h

tests/404-handler.conf

tests/LightyTest.pm

tests/Makefile.in

tests/bug-06.conf

tests/bug-12.conf

tests/condition.conf

tests/docroot/123/Makefile.in

tests/docroot/Makefile.in

tests/docroot/www/Makefile.am

tests/docroot/www/Makefile.in

tests/docroot/www/expire/Makefile.in

tests/docroot/www/go/Makefile.in

tests/docroot/www/indexfile/Makefile.in

tests/fastcgi-10.conf

tests/fastcgi-13.conf

tests/fastcgi-auth.conf

tests/fastcgi-responder.conf

tests/lighttpd.conf

tests/lowercase.conf

tests/mod-compress.conf

tests/mod-compress.t

tests/mod-fastcgi.t

tests/mod-rewrite.t

tests/proxy.conf

tests/run-tests.pl

tests/var-include.conf

Show diffs side-by-side

added added

removed removed

src/mod_cgi.c

#include "server.h"

#include "stat_cache.h"

#include "keyvalue.h"

#include "log.h"

#include "connections.h"

#include "joblist.h"

#include "http_chunk.h"

#include "plugin.h"

#include <sys/types.h>

#ifdef __WIN32

#include <winsock2.h>

# include <winsock2.h>

#else

#include <sys/socket.h>

#include <sys/wait.h>

#include <sys/mman.h>

#include <netinet/in.h>

#include <arpa/inet.h>

# include <sys/socket.h>

# include <sys/wait.h>

# include <sys/mman.h>

# include <netinet/in.h>

# include <arpa/inet.h>

#endif

#include <unistd.h>

#include <stdio.h>

#include <fcntl.h>

#include "server.h"

#include "stat_cache.h"

#include "keyvalue.h"

#include "log.h"

#include "connections.h"

#include "joblist.h"

#include "http_chunk.h"

#include "plugin.h"

#ifdef HAVE_SYS_FILIO_H

# include <sys/filio.h>

#endif

typedef struct {

array *cgi;

unsigned short execute_x_only;

} plugin_config;

typedef struct {

151

152

config_values_t cv[] = {

153

{ "cgi.assign", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 0 */

154

{ "cgi.execute-x-only", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */

154

155

{ NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET}

155

156

};

156

157

165

166

assert(s);

166

167

168

s->cgi = array_init();

169

s->execute_x_only = 0;

168

170

169

171

cv[0].destination = s->cgi;

172

cv[1].destination = &(s->execute_x_only);

170

173

171

174

p->config_storage[i] = s;

172

175

580

583

#if 0

581

584

log_error_write(srv, __FILE__, __LINE__, "sd", "(debug) cgi exited fine, pid:", pid);

582

585

#endif

583

pid = 0;

584

585

586

return HANDLER_GO_ON;

586

587

} else {

587

588

log_error_write(srv, __FILE__, __LINE__, "sd", "cgi died, pid:", pid);

588

pid = 0;

589

return HANDLER_GO_ON;

590

}

591

}

1005

args[i++] = cgi_handler->ptr;

1006

}

1007

args[i++] = con->physical.path->ptr;

1008

args[i++] = NULL;

1008

args[i ] = NULL;

1009

1010

/* search for the last / */

1011

if (NULL != (c = strrchr(con->physical.path->ptr, '/'))) {

1018

*c = '/';

1019

}

1020

1021

openDevNull(STDERR_FILENO);

1022

1023

1021

/* we don't need the client socket */

1024

1022

for (i = 3; i < 256; i++) {

1025

1023

if (i != srv->errorlog_fd) close(i);

1198

1196

1199

1197

if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.assign"))) {

1200

1198

PATCH(cgi);

1199

} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("cgi.execute-x-only"))) {

1200

PATCH(execute_x_only);

1201

}

1202

}

1203

}

1220

1221

if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) return HANDLER_GO_ON;

1222

if (!S_ISREG(sce->st.st_mode)) return HANDLER_GO_ON;

1223

if (p->conf.execute_x_only == 1 && (sce->st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0) return HANDLER_GO_ON;

1223

1224

1225

s_len = fn->used - 1;

1225

1226

Older »