struct seclisten_rec {
seclisten_rec *next;
- struct sockaddr_in local_addr; /* local IP address and port */
+ struct sockaddr_in local_addr; /* local IP address and port */
int fd;
- int used; /* Only used during restart */
+ int used; /* Only used during restart */
char key[MAX_KEY];
int mutual;
char *addr;
sWS2Opts.options = &sNWTLSOpts;
if (numcerts) {
- sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h
- sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format
- sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList
+ sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h
+ sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format
+ sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList
}
else {
/* setup the socket for SSL */
sWS2Opts.wallet = keyFileName; /* no client certificate */
sWS2Opts.walletlen = unilen(keyFileName);
- sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h
+ sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h
}
/* make the IOCTL call */
typedef struct cache_hash_entry_t cache_hash_entry_t;
struct cache_hash_entry_t {
- cache_hash_entry_t *next;
- unsigned int hash;
- const void *key;
- apr_ssize_t klen;
- const void *val;
+ cache_hash_entry_t *next;
+ unsigned int hash;
+ const void *key;
+ apr_ssize_t klen;
+ const void *val;
};
/*
* cache_hash_next().
*/
struct cache_hash_index_t {
- cache_hash_t *ht;
+ cache_hash_t *ht;
cache_hash_entry_t *this, *next;
int index;
};
NULL, /* merge per-directory config structures */
create_config, /* create per-server config structure */
NULL, /* merge per-server config structures */
- disk_cache_cmds, /* command apr_table_t */
- disk_cache_register_hook /* register hooks */
+ disk_cache_cmds, /* command apr_table_t */
+ disk_cache_register_hook /* register hooks */
};
apr_mmap_t *mm;
#endif
char mtimestr[APR_RFC822_DATE_LEN];
- char sizestr[21]; /* big enough to hold any 64-bit file size + null */
+ char sizestr[21]; /* big enough to hold any 64-bit file size + null */
} a_file;
typedef struct {
**
** The value consists of a list of elements.
** DIRECT LOCK: [char (DAV_LOCK_DIRECT),
-** char (dav_lock_scope),
-** char (dav_lock_type),
-** int depth,
-** time_t expires,
-** apr_uuid_t locktoken,
-** char[] owner,
+** char (dav_lock_scope),
+** char (dav_lock_type),
+** int depth,
+** time_t expires,
+** apr_uuid_t locktoken,
+** char[] owner,
** char[] auth_user]
**
** INDIRECT LOCK: [char (DAV_LOCK_INDIRECT),
-** apr_uuid_t locktoken,
-** time_t expires,
-** apr_size_t key_size,
-** char[] key]
+** apr_uuid_t locktoken,
+** time_t expires,
+** apr_size_t key_size,
+** char[] key]
** The key is to the collection lock that resulted in this indirect lock
*/
-#define DAV_TRUE 1
-#define DAV_FALSE 0
+#define DAV_TRUE 1
+#define DAV_FALSE 0
-#define DAV_CREATE_LIST 23
-#define DAV_APPEND_LIST 24
+#define DAV_CREATE_LIST 23
+#define DAV_APPEND_LIST 24
/* Stored lock_discovery prefix */
-#define DAV_LOCK_DIRECT 1
-#define DAV_LOCK_INDIRECT 2
+#define DAV_LOCK_DIRECT 1
+#define DAV_LOCK_INDIRECT 2
-#define DAV_TYPE_INODE 10
-#define DAV_TYPE_FNAME 11
+#define DAV_TYPE_INODE 10
+#define DAV_TYPE_FNAME 11
/* ack. forward declare. */
struct dav_lock_discovery_fixed f;
dav_locktoken *locktoken;
- const char *owner; /* owner field from activelock */
- const char *auth_user; /* authenticated user who created the lock */
+ const char *owner; /* owner field from activelock */
+ const char *auth_user; /* authenticated user who created the lock */
struct dav_lock_discovery *next;
} dav_lock_discovery;
** Stored direct lock info - full lock_discovery length:
** prefix + Fixed length + lock token + 2 strings + 2 nulls (one for each string)
*/
-#define dav_size_direct(a) (1 + sizeof(dav_lock_discovery_fixed) \
+#define dav_size_direct(a) ( 1 + sizeof(dav_lock_discovery_fixed) \
+ sizeof(apr_uuid_t) \
+ ((a)->owner ? strlen((a)->owner) : 0) \
+ ((a)->auth_user ? strlen((a)->auth_user) : 0) \
+ 2)
/* Stored indirect lock info - lock token and apr_datum_t */
-#define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \
+#define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \
+ sizeof(time_t) \
+ sizeof((a)->key.dsize) + (a)->key.dsize)
*/
struct dav_lockdb_private
{
- request_rec *r; /* for accessing the uuid state */
- apr_pool_t *pool; /* a pool to use */
- const char *lockdb_path; /* where is the lock database? */
+ request_rec *r; /* for accessing the uuid state */
+ apr_pool_t *pool; /* a pool to use */
+ const char *lockdb_path; /* where is the lock database? */
- int opened; /* we opened the database */
- dav_db *db; /* if non-NULL, the lock database */
+ int opened; /* we opened the database */
+ dav_db *db; /* if non-NULL, the lock database */
};
typedef struct
{
*/
struct dav_lock_private
{
- apr_datum_t key; /* key into the lock database */
+ apr_datum_t key; /* key into the lock database */
};
typedef struct
{
ip = indirect;
while(dp) {
- *ptr++ = DAV_LOCK_DIRECT; /* Direct lock - lock_discovery struct follows */
- memcpy(ptr, dp, sizeof(dp->f)); /* Fixed portion of struct */
+ *ptr++ = DAV_LOCK_DIRECT; /* Direct lock - lock_discovery struct follows */
+ memcpy(ptr, dp, sizeof(dp->f)); /* Fixed portion of struct */
ptr += sizeof(dp->f);
memcpy(ptr, dp->locktoken, sizeof(*dp->locktoken));
ptr += sizeof(*dp->locktoken);
}
while(ip) {
- *ptr++ = DAV_LOCK_INDIRECT; /* Indirect lock prefix */
- memcpy(ptr, ip->locktoken, sizeof(*ip->locktoken)); /* Locktoken */
+ *ptr++ = DAV_LOCK_INDIRECT; /* Indirect lock prefix */
+ memcpy(ptr, ip->locktoken, sizeof(*ip->locktoken)); /* Locktoken */
ptr += sizeof(*ip->locktoken);
- memcpy(ptr, &ip->timeout, sizeof(ip->timeout)); /* Expire time */
+ memcpy(ptr, &ip->timeout, sizeof(ip->timeout)); /* Expire time */
ptr += sizeof(ip->timeout);
- memcpy(ptr, &ip->key.dsize, sizeof(ip->key.dsize)); /* Size of key */
+ memcpy(ptr, &ip->key.dsize, sizeof(ip->key.dsize)); /* Size of key */
ptr += sizeof(ip->key.dsize);
- memcpy(ptr, ip->key.dptr, ip->key.dsize); /* Key data */
+ memcpy(ptr, ip->key.dptr, ip->key.dsize); /* Key data */
ptr += ip->key.dsize;
ip = ip->next;
}
}
dav_buffer_append(p, &buf, fname);
- buf.cur_len++; /* we want the null-term here */
+ buf.cur_len++; /* we want the null-term here */
if ((err = dav_fs_save_locknull_list(p, dirpath, &buf)) != NULL) {
return dav_push_error(p, HTTP_INTERNAL_SERVER_ERROR, 0,
module AP_MODULE_DECLARE_DATA echo_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- create_echo_server_config, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- echo_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ create_echo_server_config, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ echo_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
module AP_MODULE_DECLARE_DATA asis_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- NULL, /* command apr_table_t */
- register_hooks /* register hooks */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ NULL, /* command apr_table_t */
+ register_hooks /* register hooks */
};
create_mconfig_for_server, /* server config */
NULL, /* merge server config */
suexec_cmds, /* command table */
- suexec_hooks /* register hooks */
+ suexec_hooks /* register hooks */
};
#include "http_config.h"
#include "http_connection.h"
#include "http_core.h"
-#include "http_protocol.h" /* For index_of_response(). Grump. */
+#include "http_protocol.h" /* For index_of_response(). Grump. */
#include "http_request.h"
#include "util_filter.h"
#include "http_config.h"
#include "http_connection.h"
#include "http_core.h"
-#include "http_protocol.h" /* For index_of_response(). Grump. */
+#include "http_protocol.h" /* For index_of_response(). Grump. */
#include "http_request.h"
#include "util_filter.h"
module AP_MODULE_DECLARE_DATA http_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- http_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ http_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
#include "http_config.h"
#include "http_connection.h"
#include "http_core.h"
-#include "http_protocol.h" /* For index_of_response(). Grump. */
+#include "http_protocol.h" /* For index_of_response(). Grump. */
#include "http_request.h"
/* Generate the human-readable hex representation of an unsigned long
char *dn;
int count;
int failures = 0;
- util_url_node_t *curl; /* Cached URL node */
+ util_url_node_t *curl; /* Cached URL node */
util_url_node_t curnode;
- util_search_node_t *search_nodep; /* Cached search node */
+ util_search_node_t *search_nodep; /* Cached search node */
util_search_node_t the_search_node;
apr_time_t curtime;
char *dn;
int count;
int failures = 0;
- util_url_node_t *curl; /* Cached URL node */
+ util_url_node_t *curl; /* Cached URL node */
util_url_node_t curnode;
- util_search_node_t *search_nodep; /* Cached search node */
+ util_search_node_t *search_nodep; /* Cached search node */
util_search_node_t the_search_node;
apr_time_t curtime;
module AP_MODULE_DECLARE_DATA ldap_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* create dir config */
- NULL, /* merge dir config */
- util_ldap_create_config, /* create server config */
- util_ldap_merge_config, /* merge server config */
- util_ldap_cmds, /* command table */
- util_ldap_register_hooks, /* set up request processing hooks */
+ NULL, /* create dir config */
+ NULL, /* merge dir config */
+ util_ldap_create_config, /* create server config */
+ util_ldap_merge_config, /* merge server config */
+ util_ldap_cmds, /* command table */
+ util_ldap_register_hooks, /* set up request processing hooks */
};
module AP_MODULE_DECLARE_DATA actions_module =
{
STANDARD20_MODULE_STUFF,
- create_action_dir_config, /* dir config creater */
- merge_action_dir_configs, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- action_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ create_action_dir_config, /* dir config creater */
+ merge_action_dir_configs, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ action_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
*quoted_part = NULL;
while (apr_isspace(*strp)) {
- strp++; /* go along string until non-whitespace */
+ strp++; /* go along string until non-whitespace */
}
- if (*strp == '"') { /* if that character is a double quote */
- strp++; /* step over it */
- *quoted_part = strp; /* note where the quoted part begins */
+ if (*strp == '"') { /* if that character is a double quote */
+ strp++; /* step over it */
+ *quoted_part = strp; /* note where the quoted part begins */
while (*strp && *strp != '"') {
- ++strp; /* skip the quoted portion */
+ ++strp; /* skip the quoted portion */
}
- *strp = '\0'; /* end the string with a NUL */
+ *strp = '\0'; /* end the string with a NUL */
- strp++; /* step over the last double quote */
+ strp++; /* step over the last double quote */
*string = strp;
}
}
* memory for every line of the map file
*/
string_pos = input;
- if (!*string_pos) { /* need at least two fields */
+ if (!*string_pos) { /* need at least two fields */
goto need_2_fields;
}
directive = string_pos;
- while (*string_pos && !apr_isspace(*string_pos)) { /* past directive */
+ while (*string_pos && !apr_isspace(*string_pos)) { /* past directive */
++string_pos;
}
- if (!*string_pos) { /* need at least two fields */
+ if (!*string_pos) { /* need at least two fields */
goto need_2_fields;
}
*string_pos++ = '\0';
- if (!*string_pos) { /* need at least two fields */
+ if (!*string_pos) { /* need at least two fields */
goto need_2_fields;
}
while(*string_pos && apr_isspace(*string_pos)) { /* past whitespace */
}
value = string_pos;
- while (*string_pos && !apr_isspace(*string_pos)) { /* past value */
+ while (*string_pos && !apr_isspace(*string_pos)) { /* past value */
++string_pos;
}
if (apr_isspace(*string_pos)) {
module AP_MODULE_DECLARE_DATA so_module = {
STANDARD20_MODULE_STUFF,
- NULL, /* create per-dir config */
- NULL, /* merge per-dir config */
- so_sconf_create, /* server config */
- NULL, /* merge server config */
- so_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ NULL, /* create per-dir config */
+ NULL, /* merge per-dir config */
+ so_sconf_create, /* server config */
+ NULL, /* merge server config */
+ so_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
{
STANDARD20_MODULE_STUFF,
create_mconfig_for_directory, /* create per-dir config */
- NULL, /* merge per-dir config */
- create_mconfig_for_server, /* server config */
- NULL, /* merge server config */
- speling_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ NULL, /* merge per-dir config */
+ create_mconfig_for_server, /* server config */
+ NULL, /* merge server config */
+ speling_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
module AP_MODULE_DECLARE_DATA vhost_alias_module =
{
STANDARD20_MODULE_STUFF,
- NULL, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- mva_create_server_config, /* server config */
- mva_merge_server_config, /* merge server configs */
- mva_commands, /* command apr_table_t */
+ NULL, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ mva_create_server_config, /* server config */
+ mva_merge_server_config, /* merge server configs */
+ mva_commands, /* command apr_table_t */
register_hooks /* register hooks */
};
NULL, /* server config */
NULL, /* merge server configs */
expires_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ register_hooks /* register hooks */
};
#define MAXMIMESTRING 256
/* HOWMANY must be at least 4096 to make gzip -dcq work */
-#define HOWMANY 4096
+#define HOWMANY 4096
/* SMALL_HOWMANY limits how much work we do to figure out text files */
#define SMALL_HOWMANY 1024
-#define MAXDESC 50 /* max leng of text description */
-#define MAXstring 64 /* max leng of "string" types */
+#define MAXDESC 50 /* max leng of text description */
+#define MAXstring 64 /* max leng of "string" types */
struct magic {
- struct magic *next; /* link to next entry */
- int lineno; /* line number from magic file */
+ struct magic *next; /* link to next entry */
+ int lineno; /* line number from magic file */
short flag;
-#define INDIR 1 /* if '>(...)' appears, */
-#define UNSIGNED 2 /* comparison is unsigned */
- short cont_level; /* level of ">" */
+#define INDIR 1 /* if '>(...)' appears, */
+#define UNSIGNED 2 /* comparison is unsigned */
+ short cont_level; /* level of ">" */
struct {
- char type; /* byte short long */
- long offset; /* offset from indirection */
+ char type; /* byte short long */
+ long offset; /* offset from indirection */
} in;
- long offset; /* offset to magic number */
- unsigned char reln; /* relation (0=eq, '>'=gt, etc) */
- char type; /* int, short, long or string. */
- char vallen; /* length of string value, if any */
-#define BYTE 1
-#define SHORT 2
-#define LONG 4
+ long offset; /* offset to magic number */
+ unsigned char reln; /* relation (0=eq, '>'=gt, etc) */
+ char type; /* int, short, long or string. */
+ char vallen; /* length of string value, if any */
+#define BYTE 1
+#define SHORT 2
+#define LONG 4
#define STRING 5
-#define DATE 6
-#define BESHORT 7
+#define DATE 6
+#define BESHORT 7
#define BELONG 8
#define BEDATE 9
-#define LESHORT 10
-#define LELONG 11
-#define LEDATE 12
+#define LESHORT 10
+#define LELONG 11
+#define LEDATE 12
union VALUETYPE {
unsigned char b;
unsigned short h;
unsigned long l;
char s[MAXstring];
- unsigned char hs[2]; /* 2 bytes of a fixed-endian "short" */
- unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */
- } value; /* either number or string */
- unsigned long mask; /* mask before comparison with value */
- char nospflag; /* supress space character */
+ unsigned char hs[2]; /* 2 bytes of a fixed-endian "short" */
+ unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */
+ } value; /* either number or string */
+ unsigned long mask; /* mask before comparison with value */
+ char nospflag; /* supress space character */
/* NOTE: this string is suspected of overrunning - find it! */
- char desc[MAXDESC]; /* description */
+ char desc[MAXDESC]; /* description */
};
/*
};
/* The magic field is filled with this if uname and gname are valid. */
-#define TMAGIC "ustar " /* 7 chars and a null */
+#define TMAGIC "ustar " /* 7 chars and a null */
/*
* file-function prototypes
/* these types are used to index the apr_table_t 'types': keep em in sync! */
/* HTML inserted in first because this is a web server module now */
-#define L_HTML 0 /* HTML */
-#define L_C 1 /* first and foremost on UNIX */
-#define L_FORT 2 /* the oldest one */
-#define L_MAKE 3 /* Makefiles */
-#define L_PLI 4 /* PL/1 */
-#define L_MACH 5 /* some kinda assembler */
-#define L_ENG 6 /* English */
-#define L_PAS 7 /* Pascal */
-#define L_MAIL 8 /* Electronic mail */
-#define L_NEWS 9 /* Usenet Netnews */
+#define L_HTML 0 /* HTML */
+#define L_C 1 /* first and foremost on UNIX */
+#define L_FORT 2 /* the oldest one */
+#define L_MAKE 3 /* Makefiles */
+#define L_PLI 4 /* PL/1 */
+#define L_MACH 5 /* some kinda assembler */
+#define L_ENG 6 /* English */
+#define L_PAS 7 /* Pascal */
+#define L_MAIL 8 /* Electronic mail */
+#define L_NEWS 9 /* Usenet Netnews */
static char *types[] =
{
- "text/html", /* HTML */
- "text/plain", /* "c program text", */
- "text/plain", /* "fortran program text", */
- "text/plain", /* "make commands text", */
- "text/plain", /* "pl/1 program text", */
- "text/plain", /* "assembler program text", */
- "text/plain", /* "English text", */
- "text/plain", /* "pascal program text", */
- "message/rfc822", /* "mail text", */
- "message/news", /* "news text", */
- "application/binary", /* "can't happen error on names.h/types", */
+ "text/html", /* HTML */
+ "text/plain", /* "c program text", */
+ "text/plain", /* "fortran program text", */
+ "text/plain", /* "make commands text", */
+ "text/plain", /* "pl/1 program text", */
+ "text/plain", /* "assembler program text", */
+ "text/plain", /* "English text", */
+ "text/plain", /* "pascal program text", */
+ "message/rfc822", /* "mail text", */
+ "message/news", /* "news text", */
+ "application/binary", /* "can't happen error on names.h/types", */
0
};
},
{
"/*", L_C
- }, /* must precede "The", "the", etc. */
+ }, /* must precede "The", "the", etc. */
{
"#include", L_C
},
*/
typedef struct magic_rsl_s {
- char *str; /* string, possibly a fragment */
- struct magic_rsl_s *next; /* pointer to next fragment */
+ char *str; /* string, possibly a fragment */
+ struct magic_rsl_s *next; /* pointer to next fragment */
} magic_rsl;
/*
/* per-server info */
typedef struct {
- const char *magicfile; /* where magic be found */
- struct magic *magic; /* head of magic config list */
+ const char *magicfile; /* where magic be found */
+ struct magic *magic; /* head of magic config list */
struct magic *last;
} magic_server_config_rec;
/* per-request info */
typedef struct {
- magic_rsl *head; /* result string list */
+ magic_rsl *head; /* result string list */
magic_rsl *tail;
- unsigned suf_recursion; /* recursion depth in suffix check */
+ unsigned suf_recursion; /* recursion depth in suffix check */
} magic_req_rec;
/*
/* allocate and copy a contiguous string from a result string list */
static char *rsl_strdup(request_rec *r, int start_frag, int start_pos, int len)
{
- char *result; /* return value */
- int cur_frag, /* current fragment number/counter */
- cur_pos, /* current position within fragment */
- res_pos; /* position in result string */
- magic_rsl *frag; /* list-traversal pointer */
+ char *result; /* return value */
+ int cur_frag, /* current fragment number/counter */
+ cur_pos, /* current position within fragment */
+ res_pos; /* position in result string */
+ magic_rsl *frag; /* list-traversal pointer */
magic_req_rec *req_dat = (magic_req_rec *)
ap_get_module_config(r->request_config, &mime_magic_module);
/* process the RSL and set the MIME info in the request record */
static int magic_rsl_to_request(request_rec *r)
{
- int cur_frag, /* current fragment number/counter */
- cur_pos, /* current position within fragment */
- type_frag, /* content type starting point: fragment */
- type_pos, /* content type starting point: position */
- type_len, /* content type length */
- encoding_frag, /* content encoding starting point: fragment */
- encoding_pos, /* content encoding starting point: position */
- encoding_len; /* content encoding length */
-
- magic_rsl *frag; /* list-traversal pointer */
+ int cur_frag, /* current fragment number/counter */
+ cur_pos, /* current position within fragment */
+ type_frag, /* content type starting point: fragment */
+ type_pos, /* content type starting point: position */
+ type_len, /* content type length */
+ encoding_frag, /* content encoding starting point: fragment */
+ encoding_pos, /* content encoding starting point: position */
+ encoding_len; /* content encoding length */
+
+ magic_rsl *frag; /* list-traversal pointer */
rsl_states state;
magic_req_rec *req_dat = (magic_req_rec *)
static int magic_process(request_rec *r)
{
apr_file_t *fd = NULL;
- unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */
- apr_size_t nbytes = 0; /* number of bytes read from a datafile */
+ unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */
+ apr_size_t nbytes = 0; /* number of bytes read from a datafile */
int result;
/*
return DECLINED;
}
else {
- buf[nbytes++] = '\0'; /* null-terminate it */
+ buf[nbytes++] = '\0'; /* null-terminate it */
result = tryit(r, buf, nbytes, 1);
if (result != OK) {
return result;
m->lineno = lineno;
while (*l == '>') {
- ++l; /* step over */
+ ++l; /* step over */
m->cont_level++;
}
if (m->cont_level != 0 && *l == '(') {
- ++l; /* step over */
+ ++l; /* step over */
m->flag |= INDIR;
}
if (*l == 'x' && apr_isspace(l[1])) {
m->reln = *l;
++l;
- goto GetDesc; /* Bill The Cat */
+ goto GetDesc; /* Bill The Cat */
}
m->reln = '=';
break;
case '6':
case '7':
val = c - '0';
- c = *s++; /* try for 2 */
+ c = *s++; /* try for 2 */
if (c >= '0' && c <= '7') {
val = (val << 3) | (c - '0');
- c = *s++; /* try for 3 */
+ c = *s++; /* try for 3 */
if (c >= '0' && c <= '7')
val = (val << 3) | (c - '0');
else
/* \x and up to 3 hex digits */
case 'x':
- val = 'x'; /* Default if no digits */
- c = hextoint(*s++); /* Get next char */
+ val = 'x'; /* Default if no digits */
+ c = hextoint(*s++); /* Get next char */
if (c >= 0) {
val = c;
c = hextoint(*s++);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
MODNAME ": matched after %d rules", rule_counter);
#endif
- return 1; /* all through */
+ return 1; /* all through */
}
#if MIME_MAGIC_DEBUG
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
MODNAME ": failed after %d rules", rule_counter);
#endif
- return 0; /* no match at all */
+ return 0; /* no match at all */
}
static void mprint(request_rec *r, union VALUETYPE *p, struct magic *m)
{
int has_escapes = 0;
unsigned char *s;
- char nbuf[HOWMANY + 1]; /* one extra for terminating '\0' */
+ char nbuf[HOWMANY + 1]; /* one extra for terminating '\0' */
char *token;
register struct names *p;
int small_nbytes;
unsigned char *tp = buf + 1;
while (apr_isspace(*tp))
- ++tp; /* skip leading whitespace */
+ ++tp; /* skip leading whitespace */
if ((apr_isalnum(*tp) || *tp == '\\') &&
(apr_isalnum(*(tp + 1)) || *tp == '"')) {
magic_rsl_puts(r, "application/x-troff");
s[small_nbytes] = '\0';
has_escapes = (memchr(s, '\033', small_nbytes) != NULL);
while ((token = apr_strtok((char *) s, " \t\n\r\f", &strtok_state)) != NULL) {
- s = NULL; /* make apr_strtok() keep on tokin' */
+ s = NULL; /* make apr_strtok() keep on tokin' */
for (p = names; p < names + NNAMES; p++) {
if (STREQ(p->name, token)) {
magic_rsl_puts(r, types[p->type]);
apr_size_t maglen;
char *argv[3];
int silent;
- char *encoding; /* MUST be lowercase */
+ char *encoding; /* MUST be lowercase */
} compr[] = {
/* we use gzip here rather than uncompress because we have to pass
sum += ' ' * sizeof header->header.chksum;
if (sum != recsum)
- return 0; /* Not a tar archive */
+ return 0; /* Not a tar archive */
if (0 == strcmp(header->header.magic, TMAGIC))
- return 2; /* Unix Standard tar archive */
+ return 2; /* Unix Standard tar archive */
- return 1; /* Old fashioned tar archive */
+ return 1; /* Old fashioned tar archive */
}
{
register long value;
- while (apr_isspace(*where)) { /* Skip spaces */
+ while (apr_isspace(*where)) { /* Skip spaces */
where++;
if (--digs <= 0)
- return -1; /* All blank field */
+ return -1; /* All blank field */
}
value = 0;
- while (digs > 0 && isodigit(*where)) { /* Scan til nonoctal */
+ while (digs > 0 && isodigit(*where)) { /* Scan til nonoctal */
value = (value << 3) | (*where++ - '0');
--digs;
}
if (digs > 0 && *where && !apr_isspace(*where))
- return -1; /* Ended on non-space/nul */
+ return -1; /* Ended on non-space/nul */
return value;
}
*
* Special values for 'name' are:
*
- * server_addr IP address of interface on which request arrived
- * (analogous to SERVER_ADDR set in ap_add_common_vars())
+ * server_addr IP address of interface on which request arrived
+ * (analogous to SERVER_ADDR set in ap_add_common_vars())
* remote_host Remote host name (if available)
* remote_addr Remote IP address
* request_method Request method (GET, POST, etc)
* any non-NULL magic constant will do... used to indicate if AP_REG_ICASE should
* be used
*/
-#define ICASE_MAGIC ((void *)(&setenvif_module))
+#define ICASE_MAGIC ((void *)(&setenvif_module))
#define SEI_MAGIC_HEIRLOOM "setenvif-phase-flag"
static int is_header_regex(apr_pool_t *p, const char* name)
create_setenvif_config_svr, /* server config */
merge_setenvif_config, /* merge server configs */
setenvif_module_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ register_hooks /* register hooks */
};
make_cookie_log_state, /* server config */
NULL, /* merge server configs */
cookie_log_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ register_hooks /* register hooks */
};
#if defined(__cplusplus) || __STDC__
#define YYPARSE_PARAM_ARG void
#define YYPARSE_PARAM_DECL
-#else /* ! ANSI-C/C++ */
+#else /* ! ANSI-C/C++ */
#define YYPARSE_PARAM_ARG
#define YYPARSE_PARAM_DECL
-#endif /* ANSI-C/C++ */
-#else /* YYPARSE_PARAM */
+#endif /* ANSI-C/C++ */
+#else /* YYPARSE_PARAM */
#ifndef YYPARSE_PARAM_TYPE
#define YYPARSE_PARAM_TYPE void *
#endif
#if defined(__cplusplus) || __STDC__
#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM
#define YYPARSE_PARAM_DECL
-#else /* ! ANSI-C/C++ */
+#else /* ! ANSI-C/C++ */
#define YYPARSE_PARAM_ARG YYPARSE_PARAM
#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;
-#endif /* ANSI-C/C++ */
-#endif /* ! YYPARSE_PARAM */
+#endif /* ANSI-C/C++ */
+#endif /* ! YYPARSE_PARAM */
int
ssl_expr_yyparse (YYPARSE_PARAM_ARG)
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
#if __STDC__
#define YY_USE_PROTOS
#define YY_USE_CONST
-#endif /* __STDC__ */
-#endif /* ! __cplusplus */
+#endif /* __STDC__ */
+#endif /* ! __cplusplus */
#ifdef __TURBOC__
#pragma warn -rch
* int a single C statement (which needs a semi-colon terminator). This
* avoids problems with code like:
*
- * if ( condition_holds )
- * yyless( 5 );
- * else
- * do_something_else();
+ * if ( condition_holds )
+ * yyless( 5 );
+ * else
+ * do_something_else();
*
* Prior to using the do-while the compiler would get upset at the
* "else" because it interpreted the "if" statement as being all
{
FILE *yy_input_file;
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
/* Size of input buffer in bytes, not including room for EOB
* characters.
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
int yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
+static int yy_init = 1; /* whether we need to initialize */
+static int yy_start = 0; /* start state number */
/* Flag which is used to allow yywrap()'s to do buffer switches
* instead of setting up a fresh yyin. A bit of a hack ...
#endif
if ( ! yy_start )
- yy_start = 1; /* first start state */
+ yy_start = 1; /* first start state */
if ( ! yyin )
yyin = stdin;
yy_load_buffer_state();
}
- while ( 1 ) /* loops until end-of-file is reached */
+ while ( 1 ) /* loops until end-of-file is reached */
{
yy_cp = yy_c_buf_p;
YY_DO_BEFORE_ACTION;
-do_action: /* This label is used only to access EOF actions. */
+do_action: /* This label is used only to access EOF actions. */
switch ( yy_act )
/* yy_get_next_buffer - try to read in a new buffer
*
* Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
+ * EOB_ACT_LAST_MATCH -
+ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ * EOB_ACT_END_OF_FILE - end of file
*/
static int yy_get_next_buffer()
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
- * next_state = yy_try_NUL_trans( current_state );
+ * next_state = yy_try_NUL_trans( current_state );
*/
#ifdef YY_USE_PROTOS
yy_hold_char = *yy_cp;
yy_c_buf_p = yy_cp;
}
-#endif /* ifndef YY_NO_UNPUT */
+#endif /* ifndef YY_NO_UNPUT */
#ifdef __cplusplus
}
}
- c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
- *yy_c_buf_p = '\0'; /* preserve yytext */
+ c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
+ *yy_c_buf_p = '\0'; /* preserve yytext */
yy_hold_char = *++yy_c_buf_p;
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
b->yy_input_file = 0;
#include "http_config.h"
#include "http_protocol.h"
#include "http_core.h"
-#include "http_log.h" /* for errors in parse_htaccess */
-#include "http_request.h" /* for default_handler (see invoke_handler) */
+#include "http_log.h" /* for errors in parse_htaccess */
+#include "http_request.h" /* for default_handler (see invoke_handler) */
#include "http_main.h"
#include "http_vhost.h"
#include "util_cfgtree.h"
#include "httpd.h"
#include "http_main.h"
#include "http_log.h"
-#include "http_config.h" /* for read_config */
-#include "http_core.h" /* for get_remote_host */
+#include "http_config.h" /* for read_config */
+#include "http_core.h" /* for get_remote_host */
#include "http_connection.h"
#include "ap_mpm.h"
#include "beosd.h"
static int mpm_state = AP_MPMQ_STARTING;
apr_thread_mutex_t *accept_mutex = NULL;
-static apr_pool_t *pconf; /* Pool for config stuff */
+static apr_pool_t *pconf; /* Pool for config stuff */
static int server_pid;
*/
static int spawn_rate = 1;
#ifndef MAX_SPAWN_RATE
-#define MAX_SPAWN_RATE (32)
+#define MAX_SPAWN_RATE (32)
#endif
static int hold_off_on_exponential_spawning;
* pthreads are stealing signals from us left and right.
*/
- ap_reclaim_child_processes(1); /* Start with SIGTERM */
+ ap_reclaim_child_processes(1); /* Start with SIGTERM */
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
"SIGHUP received. Attempting to restart");
}
module AP_MODULE_DECLARE_DATA mpm_beos_module = {
MPM20_MODULE_STUFF,
- NULL, /* hook to run before apache parses args */
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- beos_cmds, /* command apr_table_t */
- beos_hooks /* register_hooks */
+ NULL, /* hook to run before apache parses args */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ beos_cmds, /* command apr_table_t */
+ beos_hooks /* register_hooks */
};
#include "http_main.h"
#include "http_log.h"
#include "http_config.h"
-#include "http_core.h" /* for get_remote_host */
+#include "http_core.h" /* for get_remote_host */
#include "http_connection.h"
#include "mpm.h"
#include "ap_mpm.h"
#endif
server_rec *ap_server_conf;
-static apr_pool_t *pconf = NULL; /* Pool for config stuff */
+static apr_pool_t *pconf = NULL; /* Pool for config stuff */
static const char *ap_pid_fname=NULL;
/* Config globals */
module AP_MODULE_DECLARE_DATA mpm_mpmt_os2_module = {
MPM20_MODULE_STUFF,
- NULL, /* hook to run before apache parses args */
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- mpmt_os2_cmds, /* command apr_table_t */
- mpmt_os2_hooks, /* register_hooks */
+ NULL, /* hook to run before apache parses args */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ mpmt_os2_cmds, /* command apr_table_t */
+ mpmt_os2_hooks, /* register_hooks */
};
#include "http_main.h"
#include "http_log.h"
#include "http_config.h"
-#include "http_core.h" /* for get_remote_host */
+#include "http_core.h" /* for get_remote_host */
#include "http_connection.h"
#include "mpm.h"
#include "ap_mpm.h"
apr_pool_create(&pmain, pconf);
ap_run_child_init(pmain, ap_server_conf);
- if (ap_threads_max_free < ap_threads_min_free + 1) /* Don't thrash... */
+ if (ap_threads_max_free < ap_threads_min_free + 1) /* Don't thrash... */
ap_threads_max_free = ap_threads_min_free + 1;
request_count = 0;
module AP_MODULE_DECLARE_DATA mpm_netware_module = {
MPM20_MODULE_STUFF,
netware_rewrite_args, /* hook to run before apache parses args */
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
netware_mpm_cmds, /* command apr_table_t */
netware_mpm_hooks, /* register hooks */
};
#include "httpd.h"
#include "http_main.h"
#include "http_log.h"
-#include "http_config.h" /* for read_config */
-#include "http_core.h" /* for get_remote_host */
+#include "http_config.h" /* for read_config */
+#include "http_core.h" /* for get_remote_host */
#include "http_connection.h"
#include "apr_portable.h"
#include "apr_thread_proc.h"
#include "httpd.h"
#include "http_main.h"
#include "http_log.h"
-#include "http_config.h" /* for read_config */
-#include "http_core.h" /* for get_remote_host */
+#include "http_config.h" /* for read_config */
+#include "http_core.h" /* for get_remote_host */
#include "http_connection.h"
#include "apr_portable.h"
#include "apr_thread_proc.h"
server_rec *ap_server_conf;
/* Definitions of WINNT MPM specific config globals */
-static HANDLE shutdown_event; /* used to signal the parent to shutdown */
-static HANDLE restart_event; /* used to signal the parent to restart */
+static HANDLE shutdown_event; /* used to signal the parent to shutdown */
+static HANDLE restart_event; /* used to signal the parent to restart */
static char ap_coredump_dir[MAX_STRING_LEN];
AP_MODULE_DECLARE_DATA module mpm_winnt_module = {
MPM20_MODULE_STUFF,
- winnt_rewrite_args, /* hook to run before apache parses args */
- NULL, /* create per-directory config structure */
- NULL, /* merge per-directory config structures */
- NULL, /* create per-server config structure */
- NULL, /* merge per-server config structures */
- winnt_cmds, /* command apr_table_t */
- winnt_hooks /* register_hooks */
+ winnt_rewrite_args, /* hook to run before apache parses args */
+ NULL, /* create per-directory config structure */
+ NULL, /* merge per-directory config structures */
+ NULL, /* create per-server config structure */
+ NULL, /* merge per-server config structures */
+ winnt_cmds, /* command apr_table_t */
+ winnt_hooks /* register_hooks */
};
#endif /* def WIN32 */
j |= ch - ('a' - 10);
}
if (j == 0xffffffff)
- return -1; /* so that it works with 8-byte ints */
+ return -1; /* so that it works with 8-byte ints */
else
return j;
}
*
*
* Message-ID: <861zqspvtw.fsf@niobe.ewox.org>
- * Date: Fri, 7 Aug 1998 19:04:27 +0200
+ * Date: Fri, 7 Aug 1998 19:04:27 +0200
* Sender: Bugtraq List <BUGTRAQ@netspace.org>
* From: Dag-Erling Coidan =?ISO-8859-1?Q?Sm=F8rgrav?= <finrod@EWOX.ORG>
* Subject: YA Apache DoS attack
}
#endif
-#define BADSHMAT ((void *)(-1))
+#define BADSHMAT ((void *)(-1))
if ((result = shmat(shmid, 0, 0)) == BADSHMAT) {
perror("shmat");
}
if (shmctl(shmid, IPC_RMID, NULL) != 0) {
perror("shmctl(IPC_RMID)");
}
- if (result == BADSHMAT) /* now bailout */
+ if (result == BADSHMAT) /* now bailout */
exit(1);
#ifdef MOVEBREAK
if (obrk == (char *) -1)
- return; /* nothing else to do */
+ return; /* nothing else to do */
if (sbrk(-(MOVEBREAK)) == (char *) -1) {
perror("sbrk 2");
}
/* don't ask */
#define _P __P
#include <sched.h>
-#define YIELD sched_yield()
+#define YIELD sched_yield()
#else
-#define YIELD do { struct timeval zero; zero.tv_sec = zero.tv_usec = 0; select(0,0,0,0,&zero); } while(0)
+#define YIELD do { struct timeval zero; zero.tv_sec = zero.tv_usec = 0; select(0,0,0,0,&zero); } while(0)
#endif
void main (int argc, char **argv)
projects / apache / commitdiff