www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity

Part 3 of the ISAPI overhaul. Reframe the 'server conf' into 'dir conf'

Browse Source 
options, creating one single cache of loaded modules [heck, that's what
  it was before.]  This allows finer grained control of specific modules
  that must be 'configured' around to deal with their peculiarities.
  This actually saves much code when we can use global config accessors.

  Grant the module cache it's own pool, and straighen up some other nits.
  No other substantial changes in this pass.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95073 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2002-05-13 22:44:40 +00:00
parent 8a83dc69e5
commit 30f711a6fd
1 changed files with 120 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

265
modules/arch/win32/mod_isapi.c
View File

@@ -108,115 +108,64 @@
module AP_MODULE_DECLARE_DATA isapi_module; module AP_MODULE_DECLARE_DATA isapi_module;
/* Our isapi server config structure */ #define ISAPI_UNDEF -1
typedef struct {
apr_array_header_t *loaded; /* Our isapi global config values */
DWORD read_ahead_buflen; static struct isapi_global_conf {
apr_pool_t *pool;
apr_array_header_t *modules;
} loaded;
/* Our isapi per-dir config structure */
typedef struct isapi_dir_conf {
int read_ahead_buflen;
int log_unsupported; int log_unsupported;
int log_to_errlog; int log_to_errlog;
int log_to_query; int log_to_query;
} isapi_server_conf; } isapi_dir_conf;
typedef struct isapi_loaded isapi_loaded; typedef struct isapi_loaded isapi_loaded;
static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf, static apr_status_t isapi_load(apr_pool_t *p, request_rec *r,
request_rec *r, const char *fpath, const char *fpath, isapi_loaded** isa);
isapi_loaded** isa);
static void *create_isapi_server_config(apr_pool_t *p, server_rec *s) static void *create_isapi_dir_config(apr_pool_t *p, char *dummy)
{ {
isapi_server_conf *sconf = apr_palloc(p, sizeof(isapi_server_conf)); isapi_dir_conf *dir = apr_palloc(p, sizeof(isapi_dir_conf));
sconf->loaded = apr_array_make(p, 20, sizeof(isapi_loaded*));
sconf->read_ahead_buflen = 49152; dir->read_ahead_buflen = ISAPI_UNDEF;
sconf->log_unsupported = -1; dir->log_unsupported = ISAPI_UNDEF;
sconf->log_to_errlog = 0; dir->log_to_errlog = ISAPI_UNDEF;
sconf->log_to_query = 0; dir->log_to_query = ISAPI_UNDEF;
return sconf; return dir;
} }
/* static void *merge_isapi_dir_configs(apr_pool_t *p, void *base_, void *add_)
* Command handler for the ISAPIread_ahead_buflen directive, which is TAKE1
*/
static const char *isapi_cmd_read_ahead_buflen(cmd_parms *cmd, void *config,
char *arg)
{ {
isapi_server_conf *sconf = ap_get_module_config(cmd->server->module_config, isapi_dir_conf *base = (isapi_dir_conf *) base_;
&isapi_module); isapi_dir_conf *add = (isapi_dir_conf *) add_;
char *scan; isapi_dir_conf *dir = apr_palloc(p, sizeof(isapi_dir_conf));
long val;
if (((val = strtol(arg, (char **) &scan, 10)) <= 0) || *scan)
return "ISAPIread_ahead_buflen must be a legitimate value.";
sconf->read_ahead_buflen = val; dir->read_ahead_buflen = (add->read_ahead_buflen == ISAPI_UNDEF)
return NULL; ? base->read_ahead_buflen
} : add->read_ahead_buflen;
dir->log_unsupported = (add->log_unsupported == ISAPI_UNDEF)
/* ? base->log_unsupported
* Command handler for the ISAPIread_ahead_buflen directive, which is TAKE1 : add->log_unsupported;
*/ dir->log_to_errlog = (add->log_to_errlog == ISAPI_UNDEF)
static const char *isapi_cmd_log_unsupported(cmd_parms *cmd, void *config, ? base->log_to_errlog
char *arg) : add->log_to_errlog;
{ dir->log_to_query = (add->log_to_query == ISAPI_UNDEF)
isapi_server_conf *sconf = ap_get_module_config(cmd->server->module_config, ? base->log_to_query
&isapi_module); : add->log_to_query;
if (strcasecmp(arg, "on") == 0) { return dir;
sconf->log_unsupported = -1;
}
else if (strcasecmp(arg, "off") == 0) {
sconf->log_unsupported = 0;
}
else {
return "ISAPIlog_unsupported must be on or off";
}
return NULL;
}
static const char *isapi_cmd_log_to_errlog(cmd_parms *cmd, void *config,
char *arg)
{
isapi_server_conf *sconf = ap_get_module_config(cmd->server->module_config,
&isapi_module);
if (strcasecmp(arg, "on") == 0) {
sconf->log_to_errlog = -1;
}
else if (strcasecmp(arg, "off") == 0) {
sconf->log_to_errlog = 0;
}
else {
return "ISAPIlog_to_errlog must be on or off";
}
return NULL;
}
static const char *isapi_cmd_log_to_query(cmd_parms *cmd, void *config,
char *arg)
{
isapi_server_conf *sconf = ap_get_module_config(cmd->server->module_config,
&isapi_module);
if (strcasecmp(arg, "on") == 0) {
sconf->log_to_query = -1;
}
else if (strcasecmp(arg, "off") == 0) {
sconf->log_to_query = 0;
}
else {
return "ISAPIlog_to_query must be on or off";
}
return NULL;
} }
static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy, static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
const char *filename) const char *filename)
{ {
isapi_server_conf *sconf = ap_get_module_config(cmd->server->module_config,
&isapi_module);
isapi_loaded *isa, **newisa; isapi_loaded *isa, **newisa;
apr_finfo_t tmp; apr_finfo_t tmp;
apr_status_t rv; apr_status_t rv;
@@ -240,8 +189,8 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
return NULL; return NULL;
} }
/* Load the extention as cached (passing sconf) */ /* Load the extention as cached (passing NULL for r) */
rv = isapi_load(cmd->pool, sconf, NULL, fspec, &isa); rv = isapi_load(loaded.pool, NULL, fspec, &isa);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, cmd->server, ap_log_error(APLOG_MARK, APLOG_WARNING, rv, cmd->server,
"ISAPI: unable to cache %s, skipping", fspec); "ISAPI: unable to cache %s, skipping", fspec);
@@ -249,24 +198,28 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
} }
/* Add to cached list of loaded modules */ /* Add to cached list of loaded modules */
newisa = apr_array_push(sconf->loaded); newisa = apr_array_push(loaded.modules);
*newisa = isa; *newisa = isa;
return NULL; return NULL;
} }
static const command_rec isapi_cmds[] = { static const command_rec isapi_cmds[] = {
AP_INIT_TAKE1("ISAPIReadAheadBuffer", isapi_cmd_read_ahead_buflen, NULL, AP_INIT_TAKE1("ISAPIReadAheadBuffer", ap_set_int_slot,
RSRC_CONF, "Maximum bytes to initially pass to the ISAPI handler"), (void *) APR_XtOffsetOf(isapi_dir_conf, read_ahead_buflen),
AP_INIT_TAKE1("ISAPILogNotSupported", isapi_cmd_log_unsupported, NULL, OR_FILEINFO, "Maximum bytes to initially pass to the ISAPI handler"),
RSRC_CONF, "Log requests not supported by the ISAPI server"), AP_INIT_FLAG("ISAPILogNotSupported", ap_set_int_slot,
AP_INIT_TAKE1("ISAPIAppendLogToErrors", isapi_cmd_log_to_errlog, NULL, (void *) APR_XtOffsetOf(isapi_dir_conf, log_unsupported),
RSRC_CONF, "Send all Append Log requests to the error log"), OR_FILEINFO, "Log requests not supported by the ISAPI server"),
AP_INIT_TAKE1("ISAPIAppendLogToQuery", isapi_cmd_log_to_query, NULL, AP_INIT_FLAG("ISAPIAppendLogToErrors", ap_set_flag_slot,
RSRC_CONF, "Append Log requests are concatinated to the query args"), (void *) APR_XtOffsetOf(isapi_dir_conf, log_to_errlog),
OR_FILEINFO, "Send all Append Log requests to the error log"),
AP_INIT_FLAG("ISAPIAppendLogToQuery", ap_set_flag_slot,
(void *) APR_XtOffsetOf(isapi_dir_conf, log_to_query),
OR_FILEINFO, "Append Log requests are concatinated to the query args"),
AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL, AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL,
RSRC_CONF, "Cache the specified ISAPI extension in-process"), RSRC_CONF, "Cache the specified ISAPI extension in-process"),
{ NULL } {NULL}
}; };
/********************************************************** /**********************************************************
@@ -286,7 +239,7 @@ struct isapi_loaded {
int refcount; int refcount;
DWORD timeout; DWORD timeout;
BOOL fakeasync; BOOL fakeasync;
DWORD reportversion; DWORD report_version;
}; };
static apr_status_t isapi_unload(isapi_loaded* isa, int force) static apr_status_t isapi_unload(isapi_loaded* isa, int force)
@@ -314,22 +267,21 @@ static apr_status_t cleanup_isapi(void *isa)
return isapi_unload((isapi_loaded*) isa, TRUE); return isapi_unload((isapi_loaded*) isa, TRUE);
} }
static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf, static apr_status_t isapi_load(apr_pool_t *p, request_rec *r,
request_rec *r, const char *fpath, const char *fpath, isapi_loaded** isa)
isapi_loaded** isa)
{ {
isapi_loaded **found = (isapi_loaded **)sconf->loaded->elts; isapi_loaded **found = (isapi_loaded **)loaded.modules->elts;
apr_status_t rv; apr_status_t rv;
int n; int n;
for (n = 0; n < sconf->loaded->nelts; ++n) { for (n = 0; n < loaded.modules->nelts; ++n) {
if (strcasecmp(fpath, (*found)->filename) == 0) { if (strcasecmp(fpath, (*found)->filename) == 0) {
break; break;
} }
++found; ++found;
} }
if (n < sconf->loaded->nelts) if (n < loaded.modules->nelts)
{ {
*isa = *found; *isa = *found;
if ((*isa)->handle) if ((*isa)->handle)
@@ -352,7 +304,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
*/ */
(*isa)->timeout = INFINITE; /* microsecs */ (*isa)->timeout = INFINITE; /* microsecs */
(*isa)->fakeasync = TRUE; (*isa)->fakeasync = TRUE;
(*isa)->reportversion = MAKELONG(0, 5); /* Revision 5.0 */ (*isa)->report_version = MAKELONG(0, 5); /* Revision 5.0 */
} }
rv = apr_dso_load(&(*isa)->handle, fpath, p); rv = apr_dso_load(&(*isa)->handle, fpath, p);
@@ -421,7 +373,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
/* Our "Connection ID" structure */ /* Our "Connection ID" structure */
typedef struct isapi_cid { typedef struct isapi_cid {
LPEXTENSION_CONTROL_BLOCK ecb; LPEXTENSION_CONTROL_BLOCK ecb;
isapi_server_conf *sconf; isapi_dir_conf dconf;
isapi_loaded *isa; isapi_loaded *isa;
request_rec *r; request_rec *r;
PFN_HSE_IO_COMPLETION completion; PFN_HSE_IO_COMPLETION completion;
@@ -719,7 +671,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
} }
case 1002: /* HSE_REQ_GET_SSPI_INFO */ case 1002: /* HSE_REQ_GET_SSPI_INFO */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction HSE_REQ_GET_SSPI_INFO " "ISAPI: ServerSupportFunction HSE_REQ_GET_SSPI_INFO "
"is not supported: %s", r->filename); "is not supported: %s", r->filename);
@@ -730,13 +682,13 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
/* Log lpvBuffer, of lpdwSize bytes, in the URI Query (cs-uri-query) field /* Log lpvBuffer, of lpdwSize bytes, in the URI Query (cs-uri-query) field
*/ */
apr_table_set(r->notes, "isapi-parameter", (char*) lpvBuffer); apr_table_set(r->notes, "isapi-parameter", (char*) lpvBuffer);
if (cid->sconf->log_to_query) { if (cid->dconf.log_to_query) {
if (r->args) if (r->args)
r->args = apr_pstrcat(r->pool, r->args, (char*) lpvBuffer, NULL); r->args = apr_pstrcat(r->pool, r->args, (char*) lpvBuffer, NULL);
else else
r->args = apr_pstrdup(r->pool, (char*) lpvBuffer); r->args = apr_pstrdup(r->pool, (char*) lpvBuffer);
} }
if (cid->sconf->log_to_errlog) if (cid->dconf.log_to_errlog)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
"ISAPI: %s: %s", cid->r->filename, "ISAPI: %s: %s", cid->r->filename,
(char*) lpvBuffer); (char*) lpvBuffer);
@@ -750,7 +702,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
* to HSE_REQ_IO_COMPLETION, and lpvBuffer may be set to NULL. * to HSE_REQ_IO_COMPLETION, and lpvBuffer may be set to NULL.
*/ */
if (!cid->isa->fakeasync) { if (!cid->isa->fakeasync) {
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction HSE_REQ_IO_COMPLETION " "ISAPI: ServerSupportFunction HSE_REQ_IO_COMPLETION "
"is not supported: %s", r->filename); "is not supported: %s", r->filename);
@@ -770,7 +722,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
apr_file_t *fd; apr_file_t *fd;
if (!cid->isa->fakeasync && (tf->dwFlags & HSE_IO_ASYNC)) { if (!cid->isa->fakeasync && (tf->dwFlags & HSE_IO_ASYNC)) {
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction HSE_REQ_TRANSMIT_FILE " "ISAPI: ServerSupportFunction HSE_REQ_TRANSMIT_FILE "
"as HSE_IO_ASYNC is not supported: %s", r->filename); "as HSE_IO_ASYNC is not supported: %s", r->filename);
@@ -848,7 +800,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
} }
case 1007: /* HSE_REQ_REFRESH_ISAPI_ACL */ case 1007: /* HSE_REQ_REFRESH_ISAPI_ACL */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction " "ISAPI: ServerSupportFunction "
"HSE_REQ_REFRESH_ISAPI_ACL " "HSE_REQ_REFRESH_ISAPI_ACL "
@@ -861,7 +813,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
return TRUE; return TRUE;
case 1010: /* XXX: Fake it : HSE_REQ_ASYNC_READ_CLIENT */ case 1010: /* XXX: Fake it : HSE_REQ_ASYNC_READ_CLIENT */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: asynchronous I/O not supported: %s", "ISAPI: asynchronous I/O not supported: %s",
r->filename); r->filename);
@@ -869,7 +821,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
return FALSE; return FALSE;
case 1011: /* HSE_REQ_GET_IMPERSONATION_TOKEN Added in ISAPI 4.0 */ case 1011: /* HSE_REQ_GET_IMPERSONATION_TOKEN Added in ISAPI 4.0 */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction " "ISAPI: ServerSupportFunction "
"HSE_REQ_GET_IMPERSONATION_TOKEN " "HSE_REQ_GET_IMPERSONATION_TOKEN "
@@ -949,7 +901,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
#endif #endif
case 1014: /* HSE_REQ_ABORTIVE_CLOSE */ case 1014: /* HSE_REQ_ABORTIVE_CLOSE */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE" "ISAPI: ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE"
" is not supported: %s", r->filename); " is not supported: %s", r->filename);
@@ -957,7 +909,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
return FALSE; return FALSE;
case 1015: /* HSE_REQ_GET_CERT_INFO_EX Added in ISAPI 4.0 */ case 1015: /* HSE_REQ_GET_CERT_INFO_EX Added in ISAPI 4.0 */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction " "ISAPI: ServerSupportFunction "
"HSE_REQ_GET_CERT_INFO_EX " "HSE_REQ_GET_CERT_INFO_EX "
@@ -998,7 +950,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
#endif #endif
case 1017: /* HSE_REQ_CLOSE_CONNECTION Added after ISAPI 4.0 */ case 1017: /* HSE_REQ_CLOSE_CONNECTION Added after ISAPI 4.0 */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction " "ISAPI: ServerSupportFunction "
"HSE_REQ_CLOSE_CONNECTION " "HSE_REQ_CLOSE_CONNECTION "
@@ -1016,7 +968,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
case 1020: /* HSE_REQ_EXTENSION_TRIGGER Added after ISAPI 4.0 */ case 1020: /* HSE_REQ_EXTENSION_TRIGGER Added after ISAPI 4.0 */
/* Undocumented - defined by the Microsoft Jan '00 Platform SDK /* Undocumented - defined by the Microsoft Jan '00 Platform SDK
*/ */
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction " "ISAPI: ServerSupportFunction "
"HSE_REQ_EXTENSION_TRIGGER " "HSE_REQ_EXTENSION_TRIGGER "
@@ -1025,7 +977,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
return FALSE; return FALSE;
default: default:
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: ServerSupportFunction (%d) not supported: " "ISAPI: ServerSupportFunction (%d) not supported: "
"%s", dwHSERequest, r->filename); "%s", dwHSERequest, r->filename);
@@ -1042,7 +994,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
apr_status_t isapi_handler (request_rec *r) apr_status_t isapi_handler (request_rec *r)
{ {
isapi_server_conf * sconf; isapi_dir_conf *dconf;
apr_table_t *e; apr_table_t *e;
apr_status_t rv; apr_status_t rv;
isapi_loaded *isa; isapi_loaded *isa;
@@ -1054,7 +1006,7 @@ apr_status_t isapi_handler (request_rec *r)
if(strcmp(r->handler, "isapi-isa")) if(strcmp(r->handler, "isapi-isa"))
return DECLINED; return DECLINED;
sconf = ap_get_module_config(r->server->module_config, &isapi_module); dconf = ap_get_module_config(r->per_dir_config, &isapi_module);
e = r->subprocess_env; e = r->subprocess_env;
/* Use similar restrictions as CGIs /* Use similar restrictions as CGIs
@@ -1077,10 +1029,10 @@ apr_status_t isapi_handler (request_rec *r)
return HTTP_NOT_FOUND; return HTTP_NOT_FOUND;
} }
/* Load the isapi extention without caching (sconf == NULL) /* Load the isapi extention without caching (pass r value)
* but note that we will recover an existing cached module. * but note that we will recover an existing cached module.
*/ */
if (isapi_load(r->pool, sconf, r, r->filename, &isa) != APR_SUCCESS) if (isapi_load(loaded.pool, r, r->filename, &isa) != APR_SUCCESS)
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
/* Set up variables */ /* Set up variables */
@@ -1095,7 +1047,16 @@ apr_status_t isapi_handler (request_rec *r)
/* Set up connection structure and ecb */ /* Set up connection structure and ecb */
cid = apr_pcalloc(r->pool, sizeof(isapi_cid)); cid = apr_pcalloc(r->pool, sizeof(isapi_cid));
cid->sconf = ap_get_module_config(r->server->module_config, &isapi_module);
/* Fixup defaults for dconf */
cid->dconf.read_ahead_buflen = (dconf->read_ahead_buflen == ISAPI_UNDEF)
? 48192 : dconf->read_ahead_buflen;
cid->dconf.log_unsupported = (dconf->log_unsupported == ISAPI_UNDEF)
? 0 : dconf->log_unsupported;
cid->dconf.log_to_errlog = (dconf->log_to_errlog == ISAPI_UNDEF)
? 1 : dconf->log_to_errlog;
cid->dconf.log_to_query = (dconf->log_to_query == ISAPI_UNDEF)
? 1 : dconf->log_to_query;
cid->ecb = apr_pcalloc(r->pool, sizeof(struct _EXTENSION_CONTROL_BLOCK)); cid->ecb = apr_pcalloc(r->pool, sizeof(struct _EXTENSION_CONTROL_BLOCK));
cid->ecb->ConnID = (HCONN)cid; cid->ecb->ConnID = (HCONN)cid;
@@ -1106,7 +1067,7 @@ apr_status_t isapi_handler (request_rec *r)
cid->completion = NULL; cid->completion = NULL;
cid->ecb->cbSize = sizeof(EXTENSION_CONTROL_BLOCK); cid->ecb->cbSize = sizeof(EXTENSION_CONTROL_BLOCK);
cid->ecb->dwVersion = isa->reportversion; cid->ecb->dwVersion = isa->report_version;
cid->ecb->dwHttpStatusCode = 0; cid->ecb->dwHttpStatusCode = 0;
strcpy(cid->ecb->lpszLogData, ""); strcpy(cid->ecb->lpszLogData, "");
// TODO: are copies really needed here? // TODO: are copies really needed here?
@@ -1140,15 +1101,15 @@ apr_status_t isapi_handler (request_rec *r)
*/ */
if (r->remaining) { if (r->remaining) {
cid->ecb->cbTotalBytes = (apr_size_t)r->remaining; cid->ecb->cbTotalBytes = (apr_size_t)r->remaining;
if (cid->ecb->cbTotalBytes > cid->sconf->read_ahead_buflen) if (cid->ecb->cbTotalBytes > (DWORD)cid->dconf.read_ahead_buflen)
cid->ecb->cbAvailable = cid->sconf->read_ahead_buflen; cid->ecb->cbAvailable = cid->dconf.read_ahead_buflen;
else else
cid->ecb->cbAvailable = cid->ecb->cbTotalBytes; cid->ecb->cbAvailable = cid->ecb->cbTotalBytes;
} }
else else
{ {
cid->ecb->cbTotalBytes = 0xffffffff; cid->ecb->cbTotalBytes = 0xffffffff;
cid->ecb->cbAvailable = cid->sconf->read_ahead_buflen; cid->ecb->cbAvailable = cid->dconf.read_ahead_buflen;
} }
cid->ecb->lpbData = apr_pcalloc(r->pool, cid->ecb->cbAvailable + 1); cid->ecb->lpbData = apr_pcalloc(r->pool, cid->ecb->cbAvailable + 1);
@@ -1213,7 +1174,7 @@ apr_status_t isapi_handler (request_rec *r)
*/ */
if (!isa->fakeasync) { if (!isa->fakeasync) {
if (cid->sconf->log_unsupported) if (cid->dconf.log_unsupported)
{ {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
"ISAPI: %s asynch I/O request refused", "ISAPI: %s asynch I/O request refused",
@@ -1262,6 +1223,25 @@ apr_status_t isapi_handler (request_rec *r)
* *
**********************************************************/ **********************************************************/
static int isapi_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
{
apr_pool_sub_make(&loaded.pool, pconf, NULL);
if (!loaded.pool) {
ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, NULL,
"ISAPI: could not create the isapi cache pool");
return APR_EGENERAL;
}
loaded.modules = apr_array_make(loaded.pool, 20, sizeof(isapi_loaded*));
if (!loaded.modules) {
ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, NULL,
"ISAPI: could not create the isapi cache");
return APR_EGENERAL;
}
return OK;
}
static int compare_loaded(const void *av, const void *bv) static int compare_loaded(const void *av, const void *bv)
{ {
const isapi_loaded **a = av; const isapi_loaded **a = av;
@@ -1273,32 +1253,27 @@ static int compare_loaded(const void *av, const void *bv)
static int isapi_post_config(apr_pool_t *p, apr_pool_t *plog, static int isapi_post_config(apr_pool_t *p, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s) apr_pool_t *ptemp, server_rec *s)
{ {
isapi_server_conf *sconf = ap_get_module_config(s->module_config, isapi_loaded **elts = (isapi_loaded **)loaded.modules->elts;
&isapi_module); int nelts = loaded.modules->nelts;
isapi_loaded **elts = (isapi_loaded **)sconf->loaded->elts;
int nelts = sconf->loaded->nelts;
/* sort the elements of the main_server, by filename */ /* sort the elements of the main_server, by filename */
qsort(elts, nelts, sizeof(isapi_loaded*), compare_loaded); qsort(elts, nelts, sizeof(isapi_loaded*), compare_loaded);
/* and make all virtualhosts share the same */
for (s = s->next; s; s = s->next) {
ap_set_module_config(s->module_config, &isapi_module, sconf);
}
return OK; return OK;
} }
static void isapi_hooks(apr_pool_t *cont) static void isapi_hooks(apr_pool_t *cont)
{ {
ap_hook_pre_config(isapi_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(isapi_post_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(isapi_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(isapi_handler, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_handler(isapi_handler, NULL, NULL, APR_HOOK_MIDDLE);
} }
module AP_MODULE_DECLARE_DATA isapi_module = { module AP_MODULE_DECLARE_DATA isapi_module = {
STANDARD20_MODULE_STUFF, STANDARD20_MODULE_STUFF,
NULL, /* create per-dir config */ create_isapi_dir_config, /* create per-dir config */
NULL, /* merge per-dir config */ merge_isapi_dir_configs, /* merge per-dir config */
create_isapi_server_config, /* server config */ NULL, /* server config */
NULL, /* merge server config */ NULL, /* merge server config */
isapi_cmds, /* command apr_table_t */ isapi_cmds, /* command apr_table_t */
isapi_hooks /* register hooks */ isapi_hooks /* register hooks */