You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/09/16 13:55:45 UTC
svn commit: r815730 - in /httpd/mod_fcgid/trunk/modules/fcgid:
fcgid_bridge.c fcgid_bucket.c fcgid_filter.c fcgid_proctbl.h
fcgid_proctbl_unix.c fcgid_proctbl_win.c fcgid_protocol.c fcgid_protocol.h
Author: trawick
Date: Wed Sep 16 11:55:44 2009
New Revision: 815730
URL: http://svn.apache.org/viewvc?rev=815730&view=rev
Log:
don't refer to r->server as "main_server"
continue to use "main_server" only when referring to the global
server_rec
Modified:
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bucket.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_filter.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl.h
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_win.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.c
httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.h
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bridge.c Wed Sep 16 11:55:44 2009
@@ -39,7 +39,7 @@
static int g_comm_timeout;
static int g_max_requests_per_process;
-static fcgid_procnode *apply_free_procnode(server_rec * main_server,
+static fcgid_procnode *apply_free_procnode(server_rec * s,
fcgid_command * command)
{
/* Scan idle list, find a node match inode, deviceid and groupid
@@ -57,7 +57,7 @@
previous_node = proctable_get_idle_list();
busy_list_header = proctable_get_busy_list();
- safe_lock(main_server);
+ safe_lock(s);
current_node = &proc_table[previous_node->next_index];
while (current_node != proc_table) {
next_node = &proc_table[current_node->next_index];
@@ -74,21 +74,21 @@
current_node->next_index = busy_list_header->next_index;
busy_list_header->next_index = current_node - proc_table;
- safe_unlock(main_server);
+ safe_unlock(s);
return current_node;
} else
previous_node = current_node;
current_node = next_node;
}
- safe_unlock(main_server);
+ safe_unlock(s);
/* Found nothing */
return NULL;
}
static void
-return_procnode(server_rec * main_server,
+return_procnode(server_rec * s,
fcgid_procnode * procnode, int communicate_error)
{
fcgid_procnode *previous_node, *current_node, *next_node;
@@ -97,7 +97,7 @@
fcgid_procnode *idle_list_header = proctable_get_idle_list();
fcgid_procnode *busy_list_header = proctable_get_busy_list();
- safe_lock(main_server);
+ safe_lock(s);
/* Unlink the node from busy list first */
previous_node = busy_list_header;
@@ -124,18 +124,18 @@
idle_list_header->next_index = procnode - proc_table;
}
- safe_unlock(main_server);
+ safe_unlock(s);
}
static int
-count_busy_processes(server_rec * main_server, fcgid_command * command)
+count_busy_processes(server_rec * s, fcgid_command * command)
{
int result = 0;
fcgid_procnode *previous_node, *current_node, *next_node;
fcgid_procnode *proc_table = proctable_get_table_array();
fcgid_procnode *busy_list_header = proctable_get_busy_list();
- safe_lock(main_server);
+ safe_lock(s);
previous_node = busy_list_header;
current_node = &proc_table[previous_node->next_index];
@@ -152,7 +152,7 @@
current_node = next_node;
}
- safe_unlock(main_server);
+ safe_unlock(s);
return result;
}
@@ -165,7 +165,7 @@
NOTE: ipc will be clean when request pool cleanup, so I don't need to close it here
*/
fcgid_bucket_ctx *ctx = (fcgid_bucket_ctx *) thectx;
- server_rec *main_server = ctx->ipc.request->server;
+ server_rec *s = ctx->ipc.request->server;
/* Free bucket buffer */
if (ctx->buffer) {
@@ -173,7 +173,7 @@
ctx->buffer = NULL;
}
- proc_close_ipc(main_server, &ctx->ipc);
+ proc_close_ipc(s, &ctx->ipc);
if (ctx->procnode) {
/* Return procnode
@@ -188,22 +188,21 @@
(apr_time_sec(apr_time_now()) - apr_time_sec(ctx->active_time));
if (dt > g_busy_timeout) {
/* Do nothing but print log */
- ap_log_error(APLOG_MARK, APLOG_INFO, 0,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"mod_fcgid: process busy timeout, took %d seconds for this request",
dt);
} else if (ctx->has_error) {
ctx->procnode->diewhy = FCGID_DIE_COMM_ERROR;
- return_procnode(main_server, ctx->procnode,
+ return_procnode(s, ctx->procnode,
1 /* communication error */ );
} else if (g_max_requests_per_process != -1
&& ++ctx->procnode->requests_handled >=
g_max_requests_per_process) {
ctx->procnode->diewhy = FCGID_DIE_LIFETIME_EXPIRED;
- return_procnode(main_server, ctx->procnode,
+ return_procnode(s, ctx->procnode,
1 /* handled all requests */ );
} else
- return_procnode(main_server, ctx->procnode,
+ return_procnode(s, ctx->procnode,
0 /* communication ok */ );
ctx->procnode = NULL;
@@ -293,7 +292,7 @@
apr_bucket_brigade * output_brigade)
{
apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
- server_rec *main_server = r->server;
+ server_rec *s = r->server;
fcgid_command fcgi_request;
fcgid_bucket_ctx *bucket_ctx;
int i, j, cond_status;
@@ -384,7 +383,7 @@
/* Write output_brigade to fastcgi server */
if ((rv =
- proc_write_ipc(main_server, &bucket_ctx->ipc,
+ proc_write_ipc(s, &bucket_ctx->ipc,
output_brigade)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, r->server,
"mod_fcgid: error writing data to FastCGI server");
@@ -449,7 +448,7 @@
fcgid_wrapper_conf * wrapper_conf)
{
apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
- server_rec *main_server = r->server;
+ server_rec *s = r->server;
apr_status_t rv = APR_SUCCESS;
int seen_eos;
size_t request_size = 0;
@@ -459,8 +458,8 @@
FCGI_Header *stdin_request_header;
apr_bucket_brigade *output_brigade;
apr_bucket *bucket_input, *bucket_header, *bucket_eos;
- size_t max_request_len = get_max_request_len(main_server);
- size_t max_mem_request_len = get_max_mem_request_len(main_server);
+ size_t max_request_len = get_max_request_len(s);
+ size_t max_mem_request_len = get_max_mem_request_len(s);
char **envp = ap_create_environment(request_pool,
r->subprocess_env);
@@ -473,8 +472,7 @@
(role, r->server, r->connection->bucket_alloc, output_brigade)
|| !build_env_block(r->server, envp, r->connection->bucket_alloc,
output_brigade)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
"mod_fcgid: can't build begin or env request");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -497,8 +495,7 @@
AP_MODE_READBYTES,
APR_BLOCK_READ,
HUGE_STRING_LEN)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
"mod_fcgid: can't get data from http client");
apr_brigade_destroy(output_brigade);
apr_brigade_destroy(input_brigade);
@@ -523,8 +520,7 @@
if ((rv = apr_bucket_read(bucket_input, &data, &len,
APR_BLOCK_READ)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
"mod_fcgid: can't read request from HTTP client");
apr_brigade_destroy(input_brigade);
apr_brigade_destroy(output_brigade);
@@ -543,8 +539,7 @@
request_size += len;
if (request_size > max_request_len) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
"mod_fcgid: http request length %" APR_SIZE_T_FMT " > %" APR_SIZE_T_FMT,
request_size, max_request_len);
return HTTP_INTERNAL_SERVER_ERROR;
@@ -567,7 +562,7 @@
rv = apr_temp_dir_get(&tempdir, r->pool);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
"mod_fcigd: can't get tmp dir");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -578,7 +573,7 @@
rv = apr_file_mktemp(&fd, template, 0,
r->connection->pool);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
"mod_fcgid: can't open tmp file fot stdin request");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -596,7 +591,7 @@
&wrote_len)) != APR_SUCCESS
|| len != wrote_len) {
ap_log_error(APLOG_MARK, APLOG_WARNING,
- rv, main_server,
+ rv, s,
"mod_fcgid: can't write tmp file for stdin request");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -625,7 +620,7 @@
|| !init_header(FCGI_STDIN, 1, len, 0,
stdin_request_header)) {
ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ s,
"mod_fcgid: can't alloc memory for stdin request");
apr_brigade_destroy(input_brigade);
apr_brigade_destroy(output_brigade);
@@ -649,8 +644,7 @@
r->connection->bucket_alloc);
if (!stdin_request_header || !bucket_header
|| !init_header(FCGI_STDIN, 1, 0, 0, stdin_request_header)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't alloc memory for stdin request");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -659,8 +653,7 @@
/* The eos bucket now */
bucket_eos = apr_bucket_eos_create(r->connection->bucket_alloc);
if (!bucket_eos) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't alloc memory for eos bucket");
return HTTP_INTERNAL_SERVER_ERROR;
}
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bucket.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bucket.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bucket.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_bucket.c Wed Sep 16 11:55:44 2009
@@ -24,7 +24,7 @@
apr_bucket_alloc_t * bucketalloc,
char **buffer, apr_size_t * bufferlen)
{
- server_rec *main_server = ctx->ipc.request->server;
+ server_rec *s = ctx->ipc.request->server;
apr_status_t rv;
if (!ctx->buffer) {
@@ -34,7 +34,7 @@
*bufferlen = FCGID_FEED_LEN;
if ((rv =
- proc_read_ipc(main_server, &ctx->ipc, *buffer,
+ proc_read_ipc(s, &ctx->ipc, *buffer,
bufferlen)) != APR_SUCCESS) {
ctx->has_error = 1;
apr_bucket_free(*buffer);
@@ -80,7 +80,7 @@
apr_read_type_e block)
{
fcgid_bucket_ctx *ctx = (fcgid_bucket_ctx *) b->data;
- server_rec *main_server = ctx->ipc.request->server;
+ server_rec *s = ctx->ipc.request->server;
apr_status_t rv;
apr_size_t hasread, bodysize;
FCGI_Header header;
@@ -152,7 +152,7 @@
if (end != NULL) {
*end = '\0';
}
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
"mod_fcgid: stderr: %s", line);
if (end == NULL) {
break;
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_filter.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_filter.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_filter.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_filter.c Wed Sep 16 11:55:44 2009
@@ -30,10 +30,10 @@
apr_bucket_brigade *tmp_brigade;
int save_size = 0;
conn_rec *c = f->c;
- server_rec *main_server = f->r->server;
+ server_rec *s = f->r->server;
if (!g_hasinit) {
- g_buffsize = get_output_buffersize(main_server);
+ g_buffsize = get_output_buffersize(s);
g_hasinit = 1;
}
@@ -56,8 +56,7 @@
/* Read the bucket now */
if ((rv = apr_bucket_read(e, &buffer, &readlen,
APR_BLOCK_READ)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_INFO, rv,
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_INFO, rv, s,
"mod_fcgid: can't read data from fcgid handler");
return rv;
}
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl.h
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl.h?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl.h (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl.h Wed Sep 16 11:55:44 2009
@@ -86,8 +86,8 @@
size_t proctable_get_table_size(void);
fcgid_global_share *proctable_get_globalshare(void);
-void safe_lock(server_rec * main_server);
-void safe_unlock(server_rec * main_server);
+void safe_lock(server_rec * s);
+void safe_unlock(server_rec * s);
/* Just for debug */
void proctable_print_debug_info(server_rec * main_server);
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_unix.c Wed Sep 16 11:55:44 2009
@@ -251,12 +251,12 @@
return g_table_size;
}
-void safe_lock(server_rec * main_server)
+void safe_lock(server_rec * s)
{
apr_status_t rv;
if (g_global_share->must_exit) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, 0, main_server,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
"mod_fcgid: server is restarted, pid %" APR_PID_T_FMT
" must exit",
getpid());
@@ -265,20 +265,20 @@
/* Lock error is a fatal error */
if ((rv = proctable_lock_table()) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
"mod_fcgid: can't get lock in pid %" APR_PID_T_FMT,
getpid());
exit(1);
}
}
-void safe_unlock(server_rec * main_server)
+void safe_unlock(server_rec * s)
{
/* Lock error is a fatal error */
apr_status_t rv;
if ((rv = proctable_unlock_table()) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
"mod_fcgid: can't unlock in pid %" APR_PID_T_FMT,
getpid());
exit(1);
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_win.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proctbl_win.c Wed Sep 16 11:55:44 2009
@@ -121,25 +121,25 @@
return g_table_size;
}
-void safe_lock(server_rec * main_server)
+void safe_lock(server_rec * s)
{
/* Lock error is a fatal error */
apr_status_t rv;
if ((rv = proctable_lock_table()) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
"mod_fcgid: can't get lock");
exit(1);
}
}
-void safe_unlock(server_rec * main_server)
+void safe_unlock(server_rec * s)
{
/* Lock error is a fatal error */
apr_status_t rv;
if ((rv = proctable_unlock_table()) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, main_server,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
"mod_fcgid: can't unlock");
exit(1);
}
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.c?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.c Wed Sep 16 11:55:44 2009
@@ -115,7 +115,7 @@
}
int
-build_begin_block(int role, server_rec * main_server,
+build_begin_block(int role, server_rec * s,
apr_bucket_alloc_t * alloc,
apr_bucket_brigade * request_brigade)
{
@@ -138,8 +138,7 @@
/* Sanity check */
if (!begin_request_header || !begin_request_body
|| !bucket_header || !bucket_body) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't alloc memeory for begin request");
return 0;
}
@@ -147,8 +146,7 @@
/* Initialize begin request header and body */
if (!init_header(FCGI_BEGIN_REQUEST, 1, sizeof(FCGI_BeginRequestBody),
0, begin_request_header)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't init begin request header");
return 0;
}
@@ -162,7 +160,7 @@
}
int
-build_env_block(server_rec * main_server, char **envp,
+build_env_block(server_rec * s, char **envp,
apr_bucket_alloc_t * alloc,
apr_bucket_brigade * request_brigade)
{
@@ -193,8 +191,7 @@
if (!env_request_header || !buf || !env_empty_header || !bucket_header
|| !bucket_body || !bucket_empty_header) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't alloc memory for envion");
return 0;
}
@@ -202,8 +199,7 @@
/* Initialize header and body */
if (!init_header(FCGI_PARAMS, 1, bufsize, 0, env_request_header)
|| !init_header(FCGI_PARAMS, 1, 0, 0, env_empty_header)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(),
- main_server,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_os_error(), s,
"mod_fcgid: can't init env request header");
return 0;
}
Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.h
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.h?rev=815730&r1=815729&r2=815730&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.h (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_protocol.h Wed Sep 16 11:55:44 2009
@@ -103,11 +103,11 @@
int init_header(int type, int requestId, apr_size_t contentLength,
apr_size_t paddingLength, FCGI_Header * header);
-int build_begin_block(int role, server_rec * main_server,
+int build_begin_block(int role, server_rec * s,
apr_bucket_alloc_t * alloc,
apr_bucket_brigade * request_brigade);
-int build_env_block(server_rec * main_server, char **envp,
+int build_env_block(server_rec * s, char **envp,
apr_bucket_alloc_t * alloc,
apr_bucket_brigade * request_brigade);
#endif