You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2005/11/10 16:22:44 UTC
svn commit: r332309 [8/13] - in /httpd/httpd/branches/2.2.x: modules/aaa/
modules/arch/netware/ modules/arch/win32/ modules/cache/ modules/dav/fs/
modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/
modules/experimental/ modules/filters/ m...
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c Thu Nov 10 07:20:05 2005
@@ -81,8 +81,8 @@
ssl_die();
}
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "distributed scache context initialised");
- /*
- * Success ...
+ /*
+ * Success ...
*/
mc->tSessionCacheDataTable = ctx;
return;
@@ -167,7 +167,7 @@
{
SSLModConfigRec *mc = myModConfig(r->server);
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"distributed scache 'ssl_scache_dc_status'");
ap_rprintf(r, "cache type: <b>DC (Distributed Cache)</b>, "
" target: <b>%s</b><br>", mc->szSessionCacheDataFile);
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_shmcb.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_shmcb.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_shmcb.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_shmcb.c Thu Nov 10 07:20:05 2005
@@ -26,7 +26,7 @@
#include "ssl_private.h"
-/*
+/*
* This shared memory based SSL session cache implementation was
* originally written by Geoff Thorpe <geoff geoffthorpe.net> for C2Net
* Europe as a contribution to Ralf Engelschall's mod_ssl project.
@@ -88,7 +88,7 @@
* how many session-retrieves have failed.
* - removes_hit (unsigned long):
* - removes_miss (unsigned long):
- *
+ *
* Following immediately after the header is an array of "divisions".
* Each division is simply a "queue" immediately followed by its
* corresponding "cache". Each division handles some pre-defined band
@@ -135,7 +135,7 @@
* sessions are stored.
*/
-/*
+/*
* Header - can be memcpy'd to and from the front of the shared
* memory segment. NB: The first copy (commented out) has the
* elements in a meaningful order, but due to data-alignment
@@ -161,7 +161,7 @@
unsigned int index_size;
} SHMCBHeader;
-/*
+/*
* Index - can be memcpy'd to and from an index inside each
* queue's index array.
*/
@@ -172,7 +172,7 @@
unsigned char removed;
} SHMCBIndex;
-/*
+/*
* Queue - must be populated by a call to shmcb_get_division
* and the structure's pointers are used for updating (ie.
* the structure doesn't need any "set" to update values).
@@ -184,7 +184,7 @@
SHMCBIndex *indexes;
} SHMCBQueue;
-/*
+/*
* Cache - same comment as for Queue. 'Queue's are in a 1-1
* correspondance with 'Cache's and are usually carried round
* in a pair, they are only seperated for clarity.
@@ -341,17 +341,17 @@
}
/* Use anonymous shm by default, fall back on name-based. */
- rv = apr_shm_create(&(mc->pSessionCacheDataMM),
- mc->nSessionCacheDataSize,
+ rv = apr_shm_create(&(mc->pSessionCacheDataMM),
+ mc->nSessionCacheDataSize,
NULL, mc->pPool);
-
+
if (APR_STATUS_IS_ENOTIMPL(rv)) {
/* For a name-based segment, remove it first in case of a
* previous unclean shutdown. */
apr_shm_remove(mc->szSessionCacheDataFile, mc->pPool);
-
- rv = apr_shm_create(&(mc->pSessionCacheDataMM),
- mc->nSessionCacheDataSize,
+
+ rv = apr_shm_create(&(mc->pSessionCacheDataMM),
+ mc->nSessionCacheDataSize,
mc->szSessionCacheDataFile,
mc->pPool);
}
@@ -367,7 +367,7 @@
shm_segsize = apr_shm_size_get(mc->pSessionCacheDataMM);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "shmcb_init allocated %" APR_SIZE_T_FMT
+ "shmcb_init allocated %" APR_SIZE_T_FMT
" bytes of shared memory",
shm_segsize);
if (!shmcb_init_memory(s, shm_segment, shm_segsize)) {
@@ -378,8 +378,8 @@
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Shared memory session cache initialised");
- /*
- * Success ...
+ /*
+ * Success ...
*/
mc->tSessionCacheDataTable = shm_segment;
return;
@@ -509,9 +509,9 @@
(int)(average_expiry - now), (int) (min_expiry - now),
(int)(max_expiry - now));
else
- ap_rprintf(r, "expiry threshold: <b>Calculation Error!</b>"
+ ap_rprintf(r, "expiry threshold: <b>Calculation Error!</b>"
"<br>");
-
+
}
ap_rprintf(r, "index usage: <b>%d%%</b>, cache usage: <b>%d%%</b>"
"<br>", index_pct, cache_pct);
@@ -533,7 +533,7 @@
/*
**
-** Memory manipulation and low-level cache operations
+** Memory manipulation and low-level cache operations
**
*/
@@ -546,7 +546,7 @@
SHMCBCache cache;
unsigned int temp, loop, granularity;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"entered shmcb_init_memory()");
/* Calculate some sizes... */
@@ -784,7 +784,7 @@
}
-/*
+/*
**
** Weirdo cyclic buffer functions
**
@@ -1015,7 +1015,7 @@
shmcb_set_safe_uint(queue->first_pos, new_pos);
/* peek to the start of the next session */
idx = shmcb_get_index(queue, new_pos);
- /* We can use shmcb_cyclic_space because we've guaranteed
+ /* We can use shmcb_cyclic_space because we've guaranteed
* we don't fit the ambiguous full/empty case. */
shmcb_set_safe_uint(cache->pos_count,
shmcb_get_safe_uint(cache->pos_count) -
@@ -1314,7 +1314,7 @@
session_id_length = SSL_SESSION_get_session_id_length(pSession);
session_id = SSL_SESSION_get_session_id(pSession);
- if ((session_id_length == idlen)
+ if ((session_id_length == idlen)
&& (memcmp(id, session_id, idlen) == 0)) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"a match!");
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_util.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_util.c Thu Nov 10 07:20:05 2005
@@ -66,12 +66,12 @@
apr_procattr_t *procattr;
apr_proc_t *proc;
- if (apr_procattr_create(&procattr, p) != APR_SUCCESS)
+ if (apr_procattr_create(&procattr, p) != APR_SUCCESS)
return NULL;
- if (apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_FULL_BLOCK,
+ if (apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_FULL_BLOCK,
APR_FULL_BLOCK) != APR_SUCCESS)
return NULL;
- if (apr_procattr_dir_set(procattr,
+ if (apr_procattr_dir_set(procattr,
ap_make_dirstr_parent(p, cmd)) != APR_SUCCESS)
return NULL;
if (apr_procattr_cmdtype_set(procattr, APR_PROGRAM) != APR_SUCCESS)
@@ -122,7 +122,7 @@
if (path == NULL)
return FALSE;
- if (pcm & SSL_PCM_EXISTS && apr_stat(&finfo, path,
+ if (pcm & SSL_PCM_EXISTS && apr_stat(&finfo, path,
APR_FINFO_TYPE|APR_FINFO_SIZE, p) != 0)
return FALSE;
if (pcm & SSL_PCM_ISREG && finfo.filetype != APR_REG)
@@ -134,20 +134,20 @@
return TRUE;
}
-ssl_algo_t ssl_util_algotypeof(X509 *pCert, EVP_PKEY *pKey)
+ssl_algo_t ssl_util_algotypeof(X509 *pCert, EVP_PKEY *pKey)
{
ssl_algo_t t;
EVP_PKEY *pFreeKey = NULL;
-
+
t = SSL_ALGO_UNKNOWN;
if (pCert != NULL)
pFreeKey = pKey = X509_get_pubkey(pCert);
if (pKey != NULL) {
switch (EVP_PKEY_key_type(pKey)) {
- case EVP_PKEY_RSA:
+ case EVP_PKEY_RSA:
t = SSL_ALGO_RSA;
break;
- case EVP_PKEY_DSA:
+ case EVP_PKEY_DSA:
t = SSL_ALGO_DSA;
break;
default:
@@ -162,16 +162,16 @@
return t;
}
-char *ssl_util_algotypestr(ssl_algo_t t)
+char *ssl_util_algotypestr(ssl_algo_t t)
{
char *cp;
cp = "UNKNOWN";
switch (t) {
- case SSL_ALGO_RSA:
+ case SSL_ALGO_RSA:
cp = "RSA";
break;
- case SSL_ALGO_DSA:
+ case SSL_ALGO_DSA:
cp = "DSA";
break;
default:
@@ -307,8 +307,8 @@
static unsigned long ssl_util_thr_id(void)
{
- /* OpenSSL needs this to return an unsigned long. On OS/390, the pthread
- * id is a structure twice that big. Use the TCB pointer instead as a
+ /* OpenSSL needs this to return an unsigned long. On OS/390, the pthread
+ * id is a structure twice that big. Use the TCB pointer instead as a
* unique unsigned long.
*/
#ifdef __MVS__
@@ -328,7 +328,7 @@
CRYPTO_set_locking_callback(NULL);
CRYPTO_set_id_callback(NULL);
- /* Let the registered mutex cleanups do their own thing
+ /* Let the registered mutex cleanups do their own thing
*/
return APR_SUCCESS;
}
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_util_ssl.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_util_ssl.c Thu Nov 10 07:20:05 2005
@@ -90,7 +90,7 @@
/* 2. try DER+Base64 */
if ((bioS=BIO_new_file(filename, "r")) == NULL)
return NULL;
-
+
if ((bioF = BIO_new(BIO_f_base64())) == NULL) {
BIO_free(bioS);
return NULL;
@@ -119,8 +119,8 @@
static EVP_PKEY *d2i_PrivateKey_bio(BIO *bio, EVP_PKEY **key)
{
return ((EVP_PKEY *)ASN1_d2i_bio(
- (char *(*)())EVP_PKEY_new,
- (char *(*)())d2i_PrivateKey,
+ (char *(*)())EVP_PKEY_new,
+ (char *(*)())d2i_PrivateKey,
(bio), (unsigned char **)(key)));
}
#endif
@@ -256,7 +256,7 @@
char *cpCipherSuite;
char *cp;
- if (ssl == NULL)
+ if (ssl == NULL)
return "";
if ((sk = (STACK_OF(SSL_CIPHER) *)SSL_get_ciphers(ssl)) == NULL)
return "";
@@ -298,7 +298,7 @@
BOOL is_sgc;
int idx;
int i;
-
+
is_sgc = FALSE;
idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
if (idx >= 0) {
@@ -328,7 +328,7 @@
int idx;
BIGNUM *bn = NULL;
char *cp;
-
+
if ((idx = X509_get_ext_by_NID(cert, NID_basic_constraints, -1)) < 0)
return FALSE;
ext = X509_get_ext(cert, idx);
@@ -447,7 +447,7 @@
apr_dir_close(dir);
return ok;
-}
+}
/* _________________________________________________________________
**
@@ -455,7 +455,7 @@
** _________________________________________________________________
*/
-/*
+/*
* Read a file that optionally contains the server certificate in PEM
* format, possibly followed by a sequence of CA certificates that
* should be sent to the peer in the SSL Certificate message.
@@ -492,7 +492,7 @@
/* create new extra chain by loading the certs */
n = 0;
while ((x509 = modssl_PEM_read_bio_X509(bio, NULL, cb, NULL)) != NULL) {
- if (!SSL_CTX_add_extra_chain_cert(ctx, x509)) {
+ if (!SSL_CTX_add_extra_chain_cert(ctx, x509)) {
X509_free(x509);
BIO_free(bio);
return -1;
@@ -501,7 +501,7 @@
}
/* Make sure that only the error is just an EOF */
if ((err = ERR_peek_error()) > 0) {
- if (!( ERR_GET_LIB(err) == ERR_LIB_PEM
+ if (!( ERR_GET_LIB(err) == ERR_LIB_PEM
&& ERR_GET_REASON(err) == PEM_R_NO_START_LINE)) {
BIO_free(bio);
return -1;
Modified: httpd/httpd/branches/2.2.x/os/beos/beosd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/beos/beosd.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/beos/beosd.c (original)
+++ httpd/httpd/branches/2.2.x/os/beos/beosd.c Thu Nov 10 07:20:05 2005
@@ -49,14 +49,14 @@
}
-AP_DECLARE(const char *) beosd_set_user(cmd_parms *cmd,
+AP_DECLARE(const char *) beosd_set_user(cmd_parms *cmd,
void *dummy, const char *arg)
{
/* no-op */
return NULL;
}
-AP_DECLARE(const char *) beosd_set_group(cmd_parms *cmd,
+AP_DECLARE(const char *) beosd_set_group(cmd_parms *cmd,
void *dummy, const char *arg)
{
/* no-op */
@@ -78,7 +78,7 @@
int sockdes;
status = apr_socket_accept(&csd, lr->sd, ptrans);
- if (status == APR_SUCCESS) {
+ if (status == APR_SUCCESS) {
*accepted = csd;
apr_os_sock_get(&sockdes, csd);
if (sockdes >= FD_SETSIZE) {
@@ -89,7 +89,7 @@
sockdes, FD_SETSIZE);
apr_socket_close(csd);
return APR_EINTR;
- }
+ }
return status;
}
Modified: httpd/httpd/branches/2.2.x/os/beos/os.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/beos/os.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/beos/os.c (original)
+++ httpd/httpd/branches/2.2.x/os/beos/os.c Thu Nov 10 07:20:05 2005
@@ -23,7 +23,7 @@
#include "os.h"
#include "httpd.h"
#include "apr_thread_proc.h"
-#include "ap_mpm.h" /* needed for definition of
+#include "ap_mpm.h" /* needed for definition of
* ap_os_create_privileged_process */
AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
Modified: httpd/httpd/branches/2.2.x/os/bs2000/ebcdic.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/bs2000/ebcdic.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/bs2000/ebcdic.c (original)
+++ httpd/httpd/branches/2.2.x/os/bs2000/ebcdic.c Thu Nov 10 07:20:05 2005
@@ -88,7 +88,7 @@
* are stored as EBCDIC, only the semantics of \012 is completely
* different from LF (look it up in the apr_table_t above). \015 happens to be
* mapped to \015 anyway, so there's no special case for it.
- *
+ *
* In THIS table, EBCDIC-\012 is mapped to ASCII-\012.
* This apr_table_t is therefore used wherever an EBCDIC to ASCII conversion is
* needed in the server.
Modified: httpd/httpd/branches/2.2.x/os/tpf/ebcdic.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/tpf/ebcdic.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/tpf/ebcdic.c (original)
+++ httpd/httpd/branches/2.2.x/os/tpf/ebcdic.c Thu Nov 10 07:20:05 2005
@@ -176,4 +176,4 @@
}
}
#endif /*APR_CHARSET_EBCDIC*/
-
+
Modified: httpd/httpd/branches/2.2.x/os/tpf/os.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/tpf/os.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/tpf/os.c (original)
+++ httpd/httpd/branches/2.2.x/os/tpf/os.c Thu Nov 10 07:20:05 2005
@@ -34,10 +34,10 @@
return(-1);
}
#endif
-
+
/* fork and exec functions are not defined on
TPF due to the implementation of tpf_fork() */
-
+
pid_t fork(void)
{
errno = ENOSYS;
Modified: httpd/httpd/branches/2.2.x/os/unix/unixd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/unix/unixd.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/unix/unixd.c (original)
+++ httpd/httpd/branches/2.2.x/os/unix/unixd.c Thu Nov 10 07:20:05 2005
@@ -142,7 +142,7 @@
(long) unixd_config.user_id);
return -1;
}
-#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
/* this applies to Linux 2.4+ */
#ifdef AP_MPM_WANT_SET_COREDUMPDIR
if (ap_coredumpdir_configured) {
@@ -159,7 +159,7 @@
}
-AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy,
+AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy,
const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -186,7 +186,7 @@
return NULL;
}
-AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy,
+AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy,
const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -209,7 +209,7 @@
/* Check for suexec */
unixd_config.suexec_enabled = 0;
- if ((apr_stat(&wrapper, SUEXEC_BIN,
+ if ((apr_stat(&wrapper, SUEXEC_BIN,
APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
return;
}
@@ -220,7 +220,7 @@
}
-AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
+AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg, const char * arg2, int type)
{
#if (defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)) && APR_HAVE_STRUCT_RLIMIT && APR_HAVE_GETRLIMIT
@@ -407,7 +407,7 @@
#endif
union semun ick;
struct semid_ds buf;
-
+
apr_os_proc_mutex_get(&ospmutex, pmutex);
buf.sem_perm.uid = unixd_config.user_id;
buf.sem_perm.gid = unixd_config.group_id;
@@ -464,7 +464,7 @@
*accepted = NULL;
status = apr_socket_accept(&csd, lr->sd, ptrans);
- if (status == APR_SUCCESS) {
+ if (status == APR_SUCCESS) {
*accepted = csd;
#ifdef _OSD_POSIX
apr_os_sock_get(&sockdes, csd);
Modified: httpd/httpd/branches/2.2.x/os/win32/ap_regkey.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/win32/ap_regkey.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/win32/ap_regkey.c (original)
+++ httpd/httpd/branches/2.2.x/os/win32/ap_regkey.c Thu Nov 10 07:20:05 2005
@@ -29,7 +29,7 @@
AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i)
{
- static struct ap_regkey_t ap_regkey_consts[7] =
+ static struct ap_regkey_t ap_regkey_consts[7] =
{
{NULL, HKEY_CLASSES_ROOT},
{NULL, HKEY_CURRENT_CONFIG},
@@ -55,10 +55,10 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
+AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
const ap_regkey_t *parentkey,
const char *keyname,
- apr_int32_t flags,
+ apr_int32_t flags,
apr_pool_t *pool)
{
DWORD access = KEY_QUERY_VALUE;
@@ -69,10 +69,10 @@
if (flags & APR_READ)
access |= KEY_READ;
if (flags & APR_WRITE)
- access |= KEY_WRITE;
+ access |= KEY_WRITE;
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t keylen = strlen(keyname) + 1;
apr_size_t wkeylen = 256;
@@ -84,7 +84,7 @@
return APR_ENAMETOOLONG;
if (flags & APR_CREATE)
- rc = RegCreateKeyExW(parentkey->hkey, wkeyname, 0, NULL, 0,
+ rc = RegCreateKeyExW(parentkey->hkey, wkeyname, 0, NULL, 0,
access, NULL, &hkey, &exists);
else
rc = RegOpenKeyExW(parentkey->hkey, wkeyname, 0, access, &hkey);
@@ -94,7 +94,7 @@
ELSE_WIN_OS_IS_ANSI
{
if (flags & APR_CREATE)
- rc = RegCreateKeyEx(parentkey->hkey, keyname, 0, NULL, 0,
+ rc = RegCreateKeyEx(parentkey->hkey, keyname, 0, NULL, 0,
access, NULL, &hkey, &exists);
else
rc = RegOpenKeyEx(parentkey->hkey, keyname, 0, access, &hkey);
@@ -111,7 +111,7 @@
*newkey = apr_palloc(pool, sizeof(**newkey));
(*newkey)->pool = pool;
(*newkey)->hkey = hkey;
- apr_pool_cleanup_register((*newkey)->pool, (void *)(*newkey),
+ apr_pool_cleanup_register((*newkey)->pool, (void *)(*newkey),
regkey_cleanup, apr_pool_cleanup_null);
return APR_SUCCESS;
}
@@ -127,14 +127,14 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
+AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
const char *keyname,
apr_pool_t *pool)
{
LONG rc;
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t keylen = strlen(keyname) + 1;
apr_size_t wkeylen = 256;
@@ -176,9 +176,9 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
- ap_regkey_t *key,
- const char *valuename,
+AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
+ ap_regkey_t *key,
+ const char *valuename,
apr_pool_t *pool)
{
/* Retrieve a registry string value, and explode any envvars
@@ -187,9 +187,9 @@
LONG rc;
DWORD type;
apr_size_t size = 0;
-
+
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t valuelen = strlen(valuename) + 1;
apr_size_t wvallen = 256;
@@ -212,7 +212,7 @@
wvalue = apr_palloc(pool, size);
/* Read value based on size query above */
- rc = RegQueryValueExW(key->hkey, wvalname, 0, &type,
+ rc = RegQueryValueExW(key->hkey, wvalname, 0, &type,
(LPBYTE)wvalue, (DWORD *)&size);
if (rc != ERROR_SUCCESS) {
return APR_FROM_OS_ERROR(rc);
@@ -280,10 +280,10 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
- const char *valuename,
- const char *value,
- apr_int32_t flags,
+AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
+ const char *valuename,
+ const char *value,
+ apr_int32_t flags,
apr_pool_t *pool)
{
/* Retrieve a registry string value, and explode any envvars
@@ -292,9 +292,9 @@
LONG rc;
apr_size_t size = strlen(value) + 1;
DWORD type = (flags & AP_REGKEY_EXPAND) ? REG_EXPAND_SZ : REG_SZ;
-
+
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t alloclen;
apr_size_t valuelen = strlen(valuename) + 1;
@@ -307,7 +307,7 @@
return rv;
else if (valuelen)
return APR_ENAMETOOLONG;
-
+
wvallen = alloclen = size;
wvalue = apr_palloc(pool, alloclen * 2);
rv = apr_conv_utf8_to_ucs2(value, &size, wvalue, &wvallen);
@@ -320,7 +320,7 @@
* converted to bytes; the trailing L'\0' continues to be counted.
*/
size = (alloclen - wvallen) * 2;
- rc = RegSetValueExW(key->hkey, wvalname, 0, type,
+ rc = RegSetValueExW(key->hkey, wvalname, 0, type,
(LPBYTE)wvalue, (DWORD)size);
if (rc != ERROR_SUCCESS)
return APR_FROM_OS_ERROR(rc);
@@ -338,20 +338,20 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
apr_size_t *resultsize,
apr_int32_t *resulttype,
- ap_regkey_t *key,
- const char *valuename,
+ ap_regkey_t *key,
+ const char *valuename,
apr_pool_t *pool)
{
/* Retrieve a registry string value, and explode any envvars
* that the system has configured (e.g. %SystemRoot%/someapp.exe)
*/
LONG rc;
-
+
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t valuelen = strlen(valuename) + 1;
apr_size_t wvallen = 256;
@@ -363,7 +363,7 @@
else if (valuelen)
return APR_ENAMETOOLONG;
/* Read to NULL buffer to determine value size */
- rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
+ rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
NULL, (LPDWORD)resultsize);
if (rc != ERROR_SUCCESS) {
return APR_FROM_OS_ERROR(rc);
@@ -371,7 +371,7 @@
/* Read value based on size query above */
*result = apr_palloc(pool, *resultsize);
- rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
+ rc = RegQueryValueExW(key->hkey, wvalname, 0, resulttype,
(LPBYTE)*result, (LPDWORD)resultsize);
}
#endif /* APR_HAS_UNICODE_FS */
@@ -379,14 +379,14 @@
ELSE_WIN_OS_IS_ANSI
{
/* Read to NULL buffer to determine value size */
- rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
+ rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
NULL, (LPDWORD)resultsize);
if (rc != ERROR_SUCCESS)
return APR_FROM_OS_ERROR(rc);
/* Read value based on size query above */
*result = apr_palloc(pool, *resultsize);
- rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
+ rc = RegQueryValueEx(key->hkey, valuename, 0, resulttype,
(LPBYTE)*result, (LPDWORD)resultsize);
if (rc != ERROR_SUCCESS)
return APR_FROM_OS_ERROR(rc);
@@ -400,17 +400,17 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
- const char *valuename,
- const void *value,
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
+ const char *valuename,
+ const void *value,
apr_size_t valuesize,
apr_int32_t valuetype,
apr_pool_t *pool)
{
LONG rc;
-
+
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t valuelen = strlen(valuename) + 1;
apr_size_t wvallen = 256;
@@ -422,14 +422,14 @@
else if (valuelen)
return APR_ENAMETOOLONG;
- rc = RegSetValueExW(key->hkey, wvalname, 0, valuetype,
+ rc = RegSetValueExW(key->hkey, wvalname, 0, valuetype,
(LPBYTE)value, (DWORD)valuesize);
}
#endif /* APR_HAS_UNICODE_FS */
#if APR_HAS_ANSI_FS
ELSE_WIN_OS_IS_ANSI
{
- rc = RegSetValueEx(key->hkey, valuename, 0, valuetype,
+ rc = RegSetValueEx(key->hkey, valuename, 0, valuetype,
(LPBYTE)value, (DWORD)valuesize);
}
#endif
@@ -440,9 +440,9 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
+AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
ap_regkey_t *key,
- const char *valuename,
+ const char *valuename,
apr_pool_t *pool)
{
/* Retrieve a registry string value, and explode any envvars
@@ -464,7 +464,7 @@
}
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t alloclen;
apr_size_t valuelen = strlen(valuename) + 1;
@@ -490,7 +490,7 @@
#if APR_HAS_ANSI_FS
ELSE_WIN_OS_IS_ANSI
{
- /* Small possiblity the array is either unterminated
+ /* Small possiblity the array is either unterminated
* or single NULL terminated. Avert.
*/
buf = (char *)value;
@@ -524,9 +524,9 @@
}
-AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
- const char *valuename,
- int nelts,
+AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
+ const char *valuename,
+ int nelts,
const char * const * elts,
apr_pool_t *pool)
{
@@ -536,9 +536,9 @@
int i;
const void *value;
apr_size_t bufsize;
-
+
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_status_t rv;
apr_wchar_t *buf;
@@ -604,19 +604,19 @@
value = buf;
}
#endif
- return ap_regkey_value_raw_set(key, valuename, value,
+ return ap_regkey_value_raw_set(key, valuename, value,
bufsize, REG_MULTI_SZ, pool);
}
-AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
+AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
const char *valuename,
apr_pool_t *pool)
{
LONG rc;
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t valuelen = strlen(valuename) + 1;
apr_size_t wvallen = 256;
Modified: httpd/httpd/branches/2.2.x/os/win32/util_win32.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/os/win32/util_win32.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/win32/util_win32.c (original)
+++ httpd/httpd/branches/2.2.x/os/win32/util_win32.c Thu Nov 10 07:20:05 2005
@@ -31,12 +31,12 @@
apr_wchar_t wbinpath[APR_PATH_MAX];
#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
+ IF_WIN_OS_IS_UNICODE
{
apr_size_t binlen;
apr_size_t wbinlen;
apr_status_t rv;
- if (!GetModuleFileNameW(NULL, wbinpath, sizeof(wbinpath)
+ if (!GetModuleFileNameW(NULL, wbinpath, sizeof(wbinpath)
/ sizeof(apr_wchar_t))) {
return apr_get_os_error();
}
@@ -77,7 +77,7 @@
/* This code is stolen from misc/win32/misc.c and apr_private.h
- * This helper code resolves late bound entry points
+ * This helper code resolves late bound entry points
* missing from one or more releases of the Win32 API...
* but it sure would be nice if we didn't duplicate this code
* from the APR ;-)
@@ -90,7 +90,7 @@
FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal)
{
- if (!lateDllHandle[fnLib]) {
+ if (!lateDllHandle[fnLib]) {
lateDllHandle[fnLib] = LoadLibrary(lateDllName[fnLib]);
if (!lateDllHandle[fnLib])
return NULL;
@@ -138,7 +138,7 @@
}
-void CleanNullACL(void *sa)
+void CleanNullACL(void *sa)
{
if (sa) {
LocalFree(((PSECURITY_ATTRIBUTES)sa)->lpSecurityDescriptor);
@@ -148,39 +148,39 @@
/*
- * The Win32 call WaitForMultipleObjects will only allow you to wait for
- * a maximum of MAXIMUM_WAIT_OBJECTS (current 64). Since the threading
- * model in the multithreaded version of apache wants to use this call,
- * we are restricted to a maximum of 64 threads. This is a simplistic
+ * The Win32 call WaitForMultipleObjects will only allow you to wait for
+ * a maximum of MAXIMUM_WAIT_OBJECTS (current 64). Since the threading
+ * model in the multithreaded version of apache wants to use this call,
+ * we are restricted to a maximum of 64 threads. This is a simplistic
* routine that will increase this size.
*/
-DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles,
+DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles,
DWORD dwSeconds)
{
time_t tStopTime;
DWORD dwRet = WAIT_TIMEOUT;
DWORD dwIndex=0;
BOOL bFirst = TRUE;
-
+
tStopTime = time(NULL) + dwSeconds;
-
+
do {
if (!bFirst)
Sleep(1000);
else
bFirst = FALSE;
-
+
for (dwIndex = 0; dwIndex * MAXIMUM_WAIT_OBJECTS < nCount; dwIndex++) {
- dwRet = WaitForMultipleObjects(
+ dwRet = WaitForMultipleObjects(
min(MAXIMUM_WAIT_OBJECTS, nCount - (dwIndex * MAXIMUM_WAIT_OBJECTS)),
- lpHandles + (dwIndex * MAXIMUM_WAIT_OBJECTS),
+ lpHandles + (dwIndex * MAXIMUM_WAIT_OBJECTS),
0, 0);
-
- if (dwRet != WAIT_TIMEOUT) {
+
+ if (dwRet != WAIT_TIMEOUT) {
break;
}
}
} while((time(NULL) < tStopTime) && (dwRet == WAIT_TIMEOUT));
-
+
return dwRet;
}
Modified: httpd/httpd/branches/2.2.x/server/config.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/config.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/config.c (original)
+++ httpd/httpd/branches/2.2.x/server/config.c Thu Nov 10 07:20:05 2005
@@ -316,7 +316,7 @@
}
}
filters = filters->next;
- }
+ }
return OK;
}
@@ -419,19 +419,19 @@
const command_rec *cmd;
};
-static apr_status_t reload_conf_hash(void *baton)
+static apr_status_t reload_conf_hash(void *baton)
{
ap_config_hash = NULL;
return APR_SUCCESS;
}
-static void rebuild_conf_hash(apr_pool_t *p, int add_prelinked)
+static void rebuild_conf_hash(apr_pool_t *p, int add_prelinked)
{
module **m;
ap_config_hash = apr_hash_make(p);
- apr_pool_cleanup_register(p, NULL, reload_conf_hash,
+ apr_pool_cleanup_register(p, NULL, reload_conf_hash,
apr_pool_cleanup_null);
if (add_prelinked) {
for (m = ap_prelinked_modules; *m != NULL; m++) {
@@ -440,7 +440,7 @@
}
}
-static void ap_add_module_commands(module *m, apr_pool_t *p)
+static void ap_add_module_commands(module *m, apr_pool_t *p)
{
apr_pool_t *tpool;
ap_mod_list *mln;
@@ -1073,7 +1073,7 @@
ap_directive_t *sub_tree = NULL;
/* Since this function can be called recursively, allocate
- * the temporary 8k string buffer from the temp_pool rather
+ * the temporary 8k string buffer from the temp_pool rather
* than the stack to avoid over-running a fixed length stack.
*/
l = apr_palloc(temp_pool, MAX_STRING_LEN);
@@ -1142,14 +1142,14 @@
if (retval != NULL && strcmp(retval, DECLINE_CMD) != 0) {
/* If the directive in error has already been set, don't
- * replace it. Otherwise, an error inside a container
+ * replace it. Otherwise, an error inside a container
* will be reported as occuring on the first line of the
* container.
*/
if (!parms->err_directive) {
parms->err_directive = current;
}
- return retval;
+ return retval;
}
}
@@ -1335,7 +1335,7 @@
apr_status_t rv;
rv = apr_filepath_merge(&newpath, ap_server_root, file,
APR_FILEPATH_TRUENAME, p);
- if (newpath && (rv == APR_SUCCESS || APR_STATUS_IS_EPATHWILD(rv)
+ if (newpath && (rv == APR_SUCCESS || APR_STATUS_IS_EPATHWILD(rv)
|| APR_STATUS_IS_ENOENT(rv)
|| APR_STATUS_IS_ENOTDIR(rv))) {
return newpath;
@@ -1419,7 +1419,7 @@
retval = invoke_cmd(cmd, parms, sub_tree, args);
if (retval != NULL) {
- return retval;
+ return retval;
}
}
@@ -1601,7 +1601,7 @@
parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
parms.override_opts = OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER | OPT_MULTI;
- rv = ap_pcfg_openfile(&cfp, p, fname);
+ rv = ap_pcfg_openfile(&cfp, p, fname);
if (rv != APR_SUCCESS) {
char errmsg[120];
return apr_psprintf(p, "Could not open configuration file %s: %s",
@@ -1664,7 +1664,7 @@
fname, NULL);
}
- if (!ap_is_directory(p, path)){
+ if (!ap_is_directory(p, path)){
return apr_pstrcat(p, "Include directory '", path, "' not found",
NULL);
}
Modified: httpd/httpd/branches/2.2.x/server/connection.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/connection.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/connection.c (original)
+++ httpd/httpd/branches/2.2.x/server/connection.c Thu Nov 10 07:20:05 2005
@@ -173,7 +173,7 @@
if (rc != OK && rc != DONE) {
c->aborted = 1;
}
-
+
if (!c->aborted) {
ap_run_process_connection(c);
}
Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/core.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Thu Nov 10 07:20:05 2005
@@ -435,7 +435,7 @@
}
conf->allow_encoded_slashes = new->allow_encoded_slashes;
-
+
return (void*)conf;
}
@@ -476,7 +476,7 @@
#define ACCEPT_FILTER_NAME "dataready"
#endif
#endif
-#endif
+#endif
apr_table_set(conf->accf_map, "http", ACCEPT_FILTER_NAME);
apr_table_set(conf->accf_map, "https", "dataready");
#endif
@@ -1062,7 +1062,7 @@
return NULL;
}
}
-
+
if (((forbidden & NOT_IN_DIRECTORY)
&& ((found = find_parent(cmd->directive, "<Directory"))
|| (found = find_parent(cmd->directive, "<DirectoryMatch"))))
@@ -1354,7 +1354,7 @@
}
else if (!strcasecmp(k, "Options")) {
d->override |= OR_OPTIONS;
- if (v)
+ if (v)
set_allow_opts(cmd, &(d->override_opts), v);
else
d->override_opts = OPT_ALL;
@@ -2234,19 +2234,19 @@
return NULL;
}
-AP_DECLARE(const char*) ap_get_server_protocol(server_rec* s)
+AP_DECLARE(const char*) ap_get_server_protocol(server_rec* s)
{
core_server_config *conf = ap_get_module_config(s->module_config,
&core_module);
return conf->protocol;
-}
+}
-AP_DECLARE(void) ap_set_server_protocol(server_rec* s, const char* proto)
+AP_DECLARE(void) ap_set_server_protocol(server_rec* s, const char* proto)
{
core_server_config *conf = ap_get_module_config(s->module_config,
&core_module);
conf->protocol = proto;
-}
+}
static const char *set_protocol(cmd_parms *cmd, void *dummy,
const char *arg)
@@ -2513,7 +2513,7 @@
conffile = ap_server_root_relative(cmd->pool, name);
if (!conffile) {
*recursion = 0;
- return apr_pstrcat(cmd->pool, "Invalid Include path ",
+ return apr_pstrcat(cmd->pool, "Invalid Include path ",
name, NULL);
}
@@ -2596,7 +2596,7 @@
apr_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
if (conf->server_signature == srv_sig_withmail) {
- return apr_pstrcat(r->pool, prefix, "<address>",
+ return apr_pstrcat(r->pool, prefix, "<address>",
ap_get_server_version(),
" Server at <a href=\"",
ap_is_url(r->server->server_admin) ? "" : "mailto:",
@@ -3085,13 +3085,13 @@
if (!new) {
return "invalid filter name";
}
-
+
return NULL;
}
-/*
- * Insert filters requested by the AddOutputFilterByType
- * configuration directive. We cannot add filters based
- * on content-type until after the handler has started
+/*
+ * Insert filters requested by the AddOutputFilterByType
+ * configuration directive. We cannot add filters based
+ * on content-type until after the handler has started
* to run. Only then do we reliably know the content-type.
*/
void ap_add_output_filters_by_type(request_rec *r)
@@ -3129,7 +3129,7 @@
{
core_server_config *conf = ap_get_module_config(cmd->server->module_config,
&core_module);
-
+
if (strcasecmp(arg1, "on") == 0) {
conf->trace_enable = AP_TRACE_ENABLE;
}
@@ -3373,7 +3373,7 @@
AP_INIT_TAKE1("EnableExceptionHook", ap_mpm_set_exception_hook, NULL, RSRC_CONF,
"Controls whether exception hook may be called after a crash"),
#endif
-AP_INIT_TAKE1("TraceEnable", set_trace_enable, NULL, RSRC_CONF,
+AP_INIT_TAKE1("TraceEnable", set_trace_enable, NULL, RSRC_CONF,
"'on' (default), 'off' or 'extended' to trace request body content"),
{ NULL }
};
@@ -3405,9 +3405,9 @@
&& !strncmp(r->uri, r->server->path, r->server->pathlen)
&& (r->server->path[r->server->pathlen - 1] == '/'
|| r->uri[r->server->pathlen] == '/'
- || r->uri[r->server->pathlen] == '\0'))
+ || r->uri[r->server->pathlen] == '\0'))
{
- /* skip all leading /'s (e.g. http://localhost///foo)
+ /* skip all leading /'s (e.g. http://localhost///foo)
* so we are looking at only the relative path.
*/
char *path = r->uri + r->server->pathlen;
@@ -3430,7 +3430,7 @@
* /'s in a row. This happens under windows when the document
* root ends with a /
*/
- /* skip all leading /'s (e.g. http://localhost///foo)
+ /* skip all leading /'s (e.g. http://localhost///foo)
* so we are looking at only the relative path.
*/
char *path = r->uri;
@@ -3590,7 +3590,7 @@
if ((status = apr_file_open(&fd, r->filename, APR_READ | APR_BINARY
#if APR_HAS_SENDFILE
- | ((d->enable_sendfile == ENABLE_SENDFILE_OFF)
+ | ((d->enable_sendfile == ENABLE_SENDFILE_OFF)
? 0 : APR_SENDFILE_ENABLED)
#endif
, 0, r->pool)) != APR_SUCCESS) {
@@ -3610,7 +3610,7 @@
if ((errstatus = ap_meets_conditions(r)) != OK) {
apr_file_close(fd);
r->status = errstatus;
- }
+ }
else {
if (bld_content_md5) {
apr_table_setn(r->headers_out, "Content-MD5",
@@ -3621,7 +3621,7 @@
* that which can be stored in a single bucket (where the
* length field is an apr_size_t), split it into several
* buckets: */
- if (sizeof(apr_off_t) > sizeof(apr_size_t)
+ if (sizeof(apr_off_t) > sizeof(apr_size_t)
&& r->finfo.size > AP_MAX_SENDFILE) {
apr_off_t fsize = r->finfo.size;
e = apr_bucket_file_create(fd, 0, AP_MAX_SENDFILE, r->pool,
Modified: httpd/httpd/branches/2.2.x/server/core_filters.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/core_filters.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core_filters.c (original)
+++ httpd/httpd/branches/2.2.x/server/core_filters.c Thu Nov 10 07:20:05 2005
@@ -15,7 +15,7 @@
*/
/**
- * @file core_filters.c
+ * @file core_filters.c
* @brief Core input/output network filters.
*/
@@ -86,7 +86,7 @@
static void brigade_move(apr_bucket_brigade *b, apr_bucket_brigade *a,
apr_bucket *e)
{
- apr_bucket *f;
+ apr_bucket *f;
if (e != APR_BRIGADE_SENTINEL(b)) {
f = APR_RING_LAST(&b->list);
@@ -370,7 +370,7 @@
apr_interval_time_t timeout = 0;
#endif
- AP_DEBUG_ASSERT((apr_socket_timeout_get(c->client_socket, &timeout)
+ AP_DEBUG_ASSERT((apr_socket_timeout_get(c->client_socket, &timeout)
== APR_SUCCESS)
&& timeout > 0); /* socket must be in timeout mode */
@@ -517,7 +517,7 @@
return rv;
}
-#ifndef APR_MAX_IOVEC_SIZE
+#ifndef APR_MAX_IOVEC_SIZE
#define MAX_IOVEC_TO_WRITE 16
#else
#if APR_MAX_IOVEC_SIZE > 16
@@ -874,8 +874,8 @@
}
apr_brigade_destroy(b);
-
- /* drive cleanups for resources which were set aside
+
+ /* drive cleanups for resources which were set aside
* this may occur before or after termination of the request which
* created the resource
*/
@@ -888,15 +888,15 @@
more = NULL;
}
else {
- /* uh oh... change more's lifetime
- * to the input brigade's lifetime
+ /* uh oh... change more's lifetime
+ * to the input brigade's lifetime
*/
apr_bucket_brigade *tmp_more = more;
more = NULL;
ap_save_brigade(f, &more, &tmp_more, input_pool);
}
}
- apr_pool_clear(ctx->deferred_write_pool);
+ apr_pool_clear(ctx->deferred_write_pool);
}
if (rv != APR_SUCCESS) {
Modified: httpd/httpd/branches/2.2.x/server/eoc_bucket.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/eoc_bucket.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/eoc_bucket.c (original)
+++ httpd/httpd/branches/2.2.x/server/eoc_bucket.c Thu Nov 10 07:20:05 2005
@@ -17,7 +17,7 @@
#include "httpd.h"
#include "http_connection.h"
-static apr_status_t eoc_bucket_read(apr_bucket *b, const char **str,
+static apr_status_t eoc_bucket_read(apr_bucket *b, const char **str,
apr_size_t *len, apr_read_type_e block)
{
*str = NULL;
@@ -31,7 +31,7 @@
b->start = 0;
b->data = NULL;
b->type = &ap_bucket_type_eoc;
-
+
return b;
}
Modified: httpd/httpd/branches/2.2.x/server/gen_test_char.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/gen_test_char.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/gen_test_char.c (original)
+++ httpd/httpd/branches/2.2.x/server/gen_test_char.c Thu Nov 10 07:20:05 2005
@@ -66,9 +66,9 @@
/* Win32/OS2 have many of the same vulnerable characters
* as Unix sh, plus the carriage return and percent char.
* The proper escaping of these characters varies from unix
- * since Win32/OS2 use carets or doubled-double quotes,
- * and neither lf nor cr can be escaped. We escape unix
- * specific as well, to assure that cross-compiled unix
+ * since Win32/OS2 use carets or doubled-double quotes,
+ * and neither lf nor cr can be escaped. We escape unix
+ * specific as well, to assure that cross-compiled unix
* applications behave similiarly when invoked on win32/os2.
*
* Rem please keep in-sync with apr's list in win32/filesys.c
Modified: httpd/httpd/branches/2.2.x/server/listen.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/listen.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/listen.c (original)
+++ httpd/httpd/branches/2.2.x/server/listen.c Thu Nov 10 07:20:05 2005
@@ -160,7 +160,7 @@
stat = apr_socket_opt_set(s, APR_SO_REUSEADDR, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
- "make_sock: for address %pI, apr_socket_opt_set: (SO_REUSEADDR)",
+ "make_sock: for address %pI, apr_socket_opt_set: (SO_REUSEADDR)",
server->bind_addr);
apr_socket_close(s);
return stat;
@@ -197,7 +197,7 @@
return accf;
}
-static void ap_apply_accept_filter(apr_pool_t *p, ap_listen_rec *lis,
+static void ap_apply_accept_filter(apr_pool_t *p, ap_listen_rec *lis,
server_rec *server)
{
apr_socket_t *s = lis->sd;
@@ -216,7 +216,7 @@
if (accf) {
#if APR_HAS_SO_ACCEPTFILTER
- rv = apr_socket_accept_filter(s, apr_pstrdup(p, accf),
+ rv = apr_socket_accept_filter(s, apr_pstrdup(p, accf),
apr_pstrdup(p,""));
if (rv != APR_SUCCESS && !APR_STATUS_IS_ENOTIMPL(rv)) {
ap_log_perror(APLOG_MARK, APLOG_WARNING, rv, p,
@@ -225,7 +225,7 @@
}
#else
#ifdef APR_TCP_DEFER_ACCEPT
- rv = apr_socket_opt_set(s, APR_TCP_DEFER_ACCEPT, 1);
+ rv = apr_socket_opt_set(s, APR_TCP_DEFER_ACCEPT, 1);
if (rv != APR_SUCCESS && !APR_STATUS_IS_ENOTIMPL(rv)) {
ap_log_perror(APLOG_MARK, APLOG_WARNING, rv, p,
"Failed to enable APR_TCP_DEFER_ACCEPT");
@@ -241,7 +241,7 @@
return APR_SUCCESS;
}
-static const char *alloc_listener(process_rec *process, char *addr,
+static const char *alloc_listener(process_rec *process, char *addr,
apr_port_t port, const char* proto)
{
ap_listen_rec **walk, *last;
@@ -515,8 +515,8 @@
proto = ap_get_server_protocol(ls);
if (!proto) {
found = 0;
- /* No protocol was set for this vhost,
- * use the default for this listener.
+ /* No protocol was set for this vhost,
+ * use the default for this listener.
*/
for (addr = ls->addrs; addr && !found; addr = addr->next) {
for (lr = ap_listeners; lr; lr = lr->next) {
@@ -561,7 +561,7 @@
return num_listeners;
}
-AP_DECLARE_NONSTD(void) ap_close_listeners(void)
+AP_DECLARE_NONSTD(void) ap_close_listeners(void)
{
ap_listen_rec *lr;
Modified: httpd/httpd/branches/2.2.x/server/log.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/log.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/log.c (original)
+++ httpd/httpd/branches/2.2.x/server/log.c Thu Nov 10 07:20:05 2005
@@ -185,7 +185,7 @@
apr_file_open_stderr(&stderr_log, p);
}
-AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
+AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
const char *fname)
{
apr_file_t *stderr_file;
@@ -328,7 +328,7 @@
return OK;
}
-int ap_open_logs(apr_pool_t *pconf, apr_pool_t *p /* plog */,
+int ap_open_logs(apr_pool_t *pconf, apr_pool_t *p /* plog */,
apr_pool_t *ptemp, server_rec *s_main)
{
apr_status_t rc = APR_SUCCESS;
@@ -679,7 +679,7 @@
fname = ap_server_root_relative(p, filename);
if (!fname) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,
NULL, "Invalid PID file path %s, ignoring.", filename);
return;
}
@@ -732,7 +732,7 @@
fname = ap_server_root_relative(p, filename);
if (!fname) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,
NULL, "Invalid PID file path %s, ignoring.", filename);
return APR_EGENERAL;
}
@@ -794,7 +794,7 @@
if (((status = apr_procattr_create(&procattr, pl->p)) != APR_SUCCESS) ||
((status = apr_procattr_cmdtype_set(procattr,
- APR_SHELLCMD_ENV)) != APR_SUCCESS) ||
+ APR_SHELLCMD_ENV)) != APR_SUCCESS) ||
((status = apr_procattr_child_in_set(procattr,
ap_piped_log_read_fd(pl),
ap_piped_log_write_fd(pl)))
Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/main.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Thu Nov 10 07:20:05 2005
@@ -403,11 +403,11 @@
" -t -D DUMP_VHOSTS : show parsed settings (currently only "
"vhost settings)");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " -S : a synonym for -t -D DUMP_VHOSTS");
+ " -S : a synonym for -t -D DUMP_VHOSTS");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -t -D DUMP_MODULES : show all loaded modules ");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " -M : a synonym for -t -D DUMP_MODULES");
+ " -M : a synonym for -t -D DUMP_MODULES");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -t : run syntax check for config files");
@@ -563,7 +563,7 @@
case 't':
configtestonly = 1;
break;
-
+
case 'S':
configtestonly = 1;
new = (char **)apr_array_push(ap_server_config_defines);
@@ -575,7 +575,7 @@
new = (char **)apr_array_push(ap_server_config_defines);
*new = "DUMP_MODULES";
break;
-
+
case 'h':
case '?':
usage(process);
Modified: httpd/httpd/branches/2.2.x/server/mpm/beos/beos.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/beos/beos.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/beos/beos.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/beos/beos.c Thu Nov 10 07:20:05 2005
@@ -29,10 +29,10 @@
* TODO Items
*
* - on exit most worker threads segfault trying to access a kernel page.
- */
-
-#define CORE_PRIVATE
-
+ */
+
+#define CORE_PRIVATE
+
#include <kernel/OS.h>
#include <unistd.h>
#include <sys/socket.h>
@@ -40,16 +40,16 @@
#include "apr_strings.h"
#include "apr_portable.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 "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_connection.h"
#include "ap_mpm.h"
#include "beosd.h"
#include "ap_listen.h"
-#include "scoreboard.h"
+#include "scoreboard.h"
#include "mpm_common.h"
#include "mpm.h"
#include "mpm_default.h"
@@ -71,7 +71,7 @@
* the overhead.
*/
-/* we only ever have 1 main process running... */
+/* we only ever have 1 main process running... */
#define HARD_SERVER_LIMIT 1
/* Limit on the threads per process. Clients will be locked out if more than
@@ -85,7 +85,7 @@
#define HARD_THREAD_LIMIT 1
#endif
#ifndef HARD_THREAD_LIMIT
-#define HARD_THREAD_LIMIT 50
+#define HARD_THREAD_LIMIT 50
#endif
/*
@@ -103,12 +103,12 @@
static apr_pool_t *pconf; /* Pool for config stuff */
-static int server_pid;
+static int server_pid;
/*
* The max child slot ever assigned, preserved across restarts. Necessary
- * to deal with MaxClients changes across AP_SIG_GRACEFUL restarts. We use
+ * to deal with MaxClients changes across AP_SIG_GRACEFUL restarts. We use
* this value to optimize routines that have to scan the entire scoreboard.
*/
int ap_max_child_assigned = -1;
@@ -140,7 +140,7 @@
*/
static void clean_child_exit(int code, int slot)
{
- (void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD,
+ (void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD,
(request_rec*)NULL);
ap_scoreboard_image->servers[0][slot].tid = 0;
exit_thread(code);
@@ -160,8 +160,8 @@
/*
* ap_start_shutdown() and ap_start_restart(), below, are a first stab at
- * functions to initiate shutdown or restart without relying on signals.
- * Previously this was initiated in sig_term() and restart() signal handlers,
+ * functions to initiate shutdown or restart without relying on signals.
+ * Previously this was initiated in sig_term() and restart() signal handlers,
* but we want to be able to start a shutdown/restart from other sources --
* e.g. on Win32, from the service manager. Now the service manager can
* call ap_start_shutdown() or ap_start_restart() as appropiate. Note that
@@ -183,10 +183,10 @@
* may well get triggered while we are working through previous attempt
* to shutdown. We won't worry about even reporting it as it seems a little
* pointless.
- */
+ */
if (shutdown_pending == 1)
return;
-
+
shutdown_pending = 1;
}
@@ -254,7 +254,7 @@
case AP_MPMQ_MIN_SPARE_DAEMONS:
*result = 0;
return APR_SUCCESS;
- case AP_MPMQ_MIN_SPARE_THREADS:
+ case AP_MPMQ_MIN_SPARE_THREADS:
*result = max_spare_threads;
return APR_SUCCESS;
case AP_MPMQ_MAX_SPARE_DAEMONS:
@@ -287,7 +287,7 @@
*accepted = NULL;
status = apr_socket_accept(&csd, lr->sd, ptrans);
- if (status == APR_SUCCESS) {
+ if (status == APR_SUCCESS) {
*accepted = csd;
apr_os_sock_get(&sockdes, csd);
return status;
@@ -348,7 +348,7 @@
len = 4;
if (apr_socket_sendto(udp_sock, udp_sa, 0, "die!", &len) != APR_SUCCESS)
break;
- }
+ }
}
static void set_signals(void)
@@ -379,13 +379,13 @@
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGTERM)");
if (sigaction(SIGINT, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGINT)");
-
+
/* We ignore SIGPIPE */
sa.sa_handler = SIG_IGN;
if (sigaction(SIGPIPE, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGPIPE)");
- /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy
+ /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy
* processing one */
sigaddset(&sa.sa_mask, SIGHUP);
sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL);
@@ -426,7 +426,7 @@
* this we create the ptrans pool, the lifetime of which is the same
* as each connection and is reset prior to each attempt to
* process a connection.
- */
+ */
apr_pool_t *ptrans = NULL;
apr_pool_t *pworker = NULL;
@@ -435,7 +435,7 @@
*/
on_exit_thread(check_restart, (void*)worker_slot);
-
+
/* block the signals for this thread only if we're not running as a
* single process.
*/
@@ -459,7 +459,7 @@
ap_create_sb_handle(&sbh, pworker, 0, worker_slot);
(void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
-
+
/* We add an extra socket here as we add the udp_sock we use for signalling
* death. This gets added after the others.
*/
@@ -467,21 +467,21 @@
for (lr = ap_listeners, i = num_listening_sockets; i--; lr = lr->next) {
apr_pollfd_t pfd = {0};
-
+
pfd.desc_type = APR_POLL_SOCKET;
pfd.desc.s = lr->sd;
pfd.reqevents = APR_POLLIN;
pfd.client_data = lr;
-
+
apr_pollset_add(pollset, &pfd);
}
{
apr_pollfd_t pfd = {0};
-
+
pfd.desc_type = APR_POLL_SOCKET;
pfd.desc.s = udp_sock;
pfd.reqevents = APR_POLLIN;
-
+
apr_pollset_add(pollset, &pfd);
}
@@ -496,12 +496,12 @@
/* (Re)initialize this child to a pre-connection state. */
apr_pool_clear(ptrans);
- if ((ap_max_requests_per_thread > 0
+ if ((ap_max_requests_per_thread > 0
&& requests_this_child++ >= ap_max_requests_per_thread))
clean_child_exit(0, worker_slot);
-
+
(void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
-
+
apr_thread_mutex_lock(accept_mutex);
/* We always (presently) have at least 2 sockets we listen on, so
@@ -543,7 +543,7 @@
* ### hmm... this descriptor might have POLLERR rather
* ### than POLLIN
*/
-
+
lr = pdesc[last_poll_idx++].client_data;
/* The only socket we add without client_data is the first, the UDP socket
@@ -581,7 +581,7 @@
ap_process_connection(current_conn, csd);
ap_lingering_close(current_conn);
}
-
+
if (ap_my_generation !=
ap_scoreboard_image->global->running_generation) { /* restart? */
/* yeah, this could be non-graceful restart, in which case the
@@ -594,7 +594,7 @@
apr_pool_destroy(ptrans);
apr_pool_destroy(pworker);
-
+
clean_child_exit(0, worker_slot);
}
@@ -617,16 +617,16 @@
tid = spawn_thread(worker_thread, "apache_worker", B_NORMAL_PRIORITY,
(void *)slot);
if (tid < B_NO_ERROR) {
- ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL,
+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL,
"spawn_thread: Unable to start a new thread");
/* In case system resources are maxed out, we don't want
* Apache running away with the CPU trying to fork over and
- * over and over again.
+ * over and over again.
*/
- (void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD,
+ (void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD,
(request_rec*)NULL);
-
- sleep(10);
+
+ sleep(10);
return -1;
}
resume_thread(tid);
@@ -644,7 +644,7 @@
if (!restart_pending && !shutdown_pending) {
int slot = (int)data;
make_worker(slot);
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL,
"spawning a new worker thread in slot %d", slot);
}
}
@@ -737,7 +737,7 @@
while (!restart_pending && !shutdown_pending) {
ap_wait_or_timeout(&exitwhy, &status, &pid, pconf);
-
+
if (pid.pid >= 0) {
if (ap_process_child_status(&pid, exitwhy, status) == APEXIT_CHILDFATAL) {
shutdown_pending = 1;
@@ -754,10 +754,10 @@
}
if (child_slot >= 0) {
ap_scoreboard_image->servers[0][child_slot].tid = 0;
- (void) ap_update_child_status_from_indexes(0, child_slot,
- SERVER_DEAD,
+ (void) ap_update_child_status_from_indexes(0, child_slot,
+ SERVER_DEAD,
(request_rec*)NULL);
-
+
if (remaining_threads_to_start
&& child_slot < ap_thread_limit) {
/* we're still doing a 1-for-1 replacement of dead
@@ -781,7 +781,7 @@
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,
"long lost child came home! (pid %ld)", pid.pid);
}
-
+
/* Don't perform idle maintenance when a child dies,
* only do it when there's a timeout. Remember only a
* finite number of children can die, and it's pretty
@@ -808,14 +808,14 @@
/* This is called to not only setup and run for the initial time, but also
* when we've asked for a restart. This means it must be able to handle both
- * situations. It also means that when we exit here we should have tidied
+ * situations. It also means that when we exit here we should have tidied
* up after ourselves fully.
*/
int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
{
int remaining_threads_to_start, i,j;
apr_status_t rv;
- ap_listen_rec *lr;
+ ap_listen_rec *lr;
pconf = _pconf;
ap_server_conf = s;
@@ -827,7 +827,7 @@
"could not set FD_SETSIZE (_kset_fd_limit_ failed)");
}
- /* BeOS R5 doesn't support pipes on select() calls, so we use a
+ /* BeOS R5 doesn't support pipes on select() calls, so we use a
* UDP socket as these are supported in both R5 and BONE. If we only cared
* about BONE we'd use a pipe, but there it is.
* As we have UDP support in APR, now use the APR functions and check all the
@@ -850,7 +850,7 @@
"couldn't bind UDP socket!");
return 1;
}
-
+
if ((num_listening_sockets = ap_setup_listeners(ap_server_conf)) < 1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, 0, s,
"no listening sockets available, shutting down");
@@ -860,9 +860,9 @@
ap_log_pid(pconf, ap_pid_fname);
/*
- * Create our locks...
+ * Create our locks...
*/
-
+
/* accept_mutex
* used to lock around select so we only have one thread
* in select at a time
@@ -877,9 +877,9 @@
}
/*
- * Startup/shutdown...
+ * Startup/shutdown...
*/
-
+
if (!is_graceful) {
/* setup the scoreboard shared memory */
if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
@@ -904,8 +904,8 @@
/* If we're doing a graceful_restart then we're going to see a lot
* of threads exiting immediately when we get into the main loop
- * below (because we just sent them AP_SIG_GRACEFUL). This happens
- * pretty rapidly... and for each one that exits we'll start a new one
+ * below (because we just sent them AP_SIG_GRACEFUL). This happens
+ * pretty rapidly... and for each one that exits we'll start a new one
* until we reach at least threads_min_free. But we may be permitted to
* start more than that, so we'll just keep track of how many we're
* supposed to start up without the 1 second penalty between each fork.
@@ -947,18 +947,18 @@
/* We sit in the server_main_loop() until we somehow manage to exit. When
* we do, we need to kill the workers we have, so we start by using the
* tell_workers_to_exit() function, but as it sometimes takes a short while
- * to accomplish this we have a pause builtin to allow them the chance to
+ * to accomplish this we have a pause builtin to allow them the chance to
* gracefully exit.
*/
if (!one_process) {
- server_main_loop(remaining_threads_to_start);
+ server_main_loop(remaining_threads_to_start);
tell_workers_to_exit();
snooze(1000000);
} else {
worker_thread((void*)0);
}
mpm_state = AP_MPMQ_STOPPING;
-
+
/* close the UDP socket we've been using... */
apr_socket_close(udp_sock);
@@ -967,14 +967,14 @@
pidfile = ap_server_root_relative (pconf, ap_pid_fname);
if ( pidfile != NULL && unlink(pidfile) == 0)
ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf,
- "removed PID file %s (pid=%ld)", pidfile,
+ "removed PID file %s (pid=%ld)", pidfile,
(long)getpid());
}
if (one_process) {
return 1;
}
-
+
/*
* If we get here we're shutting down...
*/
@@ -985,7 +985,7 @@
if (beosd_killpg(getpgrp(), SIGTERM) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
"killpg SIGTERM");
-
+
/* use ap_reclaim_child_processes starting with SIGTERM */
ap_reclaim_child_processes(1);
@@ -994,7 +994,7 @@
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
"caught SIGTERM, shutting down");
}
-
+
return 1;
}
@@ -1005,21 +1005,21 @@
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
AP_SIG_GRACEFUL_STRING " received. Doing graceful restart");
} else {
- /* Kill 'em all. Since the child acts the same on the parents SIGTERM
+ /* Kill 'em all. Since the child acts the same on the parents SIGTERM
* and a SIGHUP, we may as well use the same signal, because some user
* pthreads are stealing signals from us left and right.
*/
-
+
ap_reclaim_child_processes(1); /* Start with SIGTERM */
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
"SIGHUP received. Attempting to restart");
}
-
- /* just before we go, tidy up the lock we created to prevent a
- * potential leak of semaphores...
+
+ /* just before we go, tidy up the lock we created to prevent a
+ * potential leak of semaphores...
*/
apr_thread_mutex_destroy(accept_mutex);
-
+
return 0;
}
@@ -1047,7 +1047,7 @@
/* sigh, want this only the second time around */
if (restart_num++ == 1) {
is_graceful = 0;
-
+
if (!one_process && !foreground) {
rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
: APR_PROC_DETACH_DAEMONIZE);
@@ -1055,7 +1055,7 @@
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
"apr_proc_detach failed");
return HTTP_INTERNAL_SERVER_ERROR;
- }
+ }
}
server_pid = getpid();
@@ -1081,11 +1081,11 @@
static void beos_hooks(apr_pool_t *p)
{
one_process = 0;
-
- ap_hook_pre_config(beos_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
+
+ ap_hook_pre_config(beos_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}
-static const char *set_threads_to_start(cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_threads_to_start(cmd_parms *cmd, void *dummy, const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
@@ -1110,15 +1110,15 @@
min_spare_threads = atoi(arg);
if (min_spare_threads <= 0) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"WARNING: detected MinSpareThreads set to non-positive.");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Resetting to 1 to avoid almost certain Apache failure.");
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Please read the documentation.");
min_spare_threads = 1;
}
-
+
return NULL;
}
@@ -1133,7 +1133,7 @@
return NULL;
}
-static const char *set_threads_limit (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_threads_limit (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
@@ -1142,18 +1142,18 @@
ap_thread_limit = atoi(arg);
if (ap_thread_limit > HARD_THREAD_LIMIT) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"WARNING: MaxClients of %d exceeds compile time limit "
"of %d servers,", ap_thread_limit, HARD_THREAD_LIMIT);
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" lowering MaxClients to %d. To increase, please "
"see the", HARD_THREAD_LIMIT);
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" HARD_THREAD_LIMIT define in server/mpm/beos/mpm_default.h.");
ap_thread_limit = HARD_THREAD_LIMIT;
- }
+ }
else if (ap_thread_limit < 1) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"WARNING: Require MaxClients > 0, setting to %d", HARD_THREAD_LIMIT);
ap_thread_limit = HARD_THREAD_LIMIT;
}
@@ -1187,7 +1187,7 @@
"Minimum number of idle children, to handle request spikes"),
AP_INIT_TAKE1( "MaxSpareThreads", set_max_spare_threads, NULL, RSRC_CONF,
"Maximum number of idle children" ),
-AP_INIT_TAKE1( "MaxClients", set_threads_limit, NULL, RSRC_CONF,
+AP_INIT_TAKE1( "MaxClients", set_threads_limit, NULL, RSRC_CONF,
"Maximum number of children alive at the same time (max threads)" ),
AP_INIT_TAKE1( "MaxRequestsPerThread", set_max_requests_per_thread, NULL, RSRC_CONF,
"Maximum number of requests served by a thread" ),
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c Thu Nov 10 07:20:05 2005
@@ -176,7 +176,7 @@
int sd;
} proc_info;
-/* Structure used to pass information to the thread responsible for
+/* Structure used to pass information to the thread responsible for
* creating the rest of the threads.
*/
typedef struct
@@ -204,8 +204,8 @@
/*
* The max child slot ever assigned, preserved across restarts. Necessary
- * to deal with MaxClients changes across AP_SIG_GRACEFUL restarts. We
- * use this value to optimize routines that have to scan the entire
+ * to deal with MaxClients changes across AP_SIG_GRACEFUL restarts. We
+ * use this value to optimize routines that have to scan the entire
* scoreboard.
*/
int ap_max_daemons_limit = -1;
@@ -238,14 +238,14 @@
static apr_pool_t *pconf; /* Pool for config stuff */
static apr_pool_t *pchild; /* Pool for httpd child stuff */
-static pid_t ap_my_pid; /* Linux getpid() doesn't work except in main
+static pid_t ap_my_pid; /* Linux getpid() doesn't work except in main
thread. Use this instead */
static pid_t parent_pid;
static apr_os_thread_t *listener_os_thread;
-/* The LISTENER_SIGNAL signal will be sent from the main thread to the
- * listener thread to wake it up for graceful termination (what a child
- * process from an old generation does when the admin does "apachectl
+/* The LISTENER_SIGNAL signal will be sent from the main thread to the
+ * listener thread to wake it up for graceful termination (what a child
+ * process from an old generation does when the admin does "apachectl
* graceful"). This signal will be blocked in all threads of a child
* process except for the listener thread.
*/
@@ -272,7 +272,7 @@
listener_may_exit = 1;
if (!listener_os_thread) {
/* XXX there is an obscure path that this doesn't handle perfectly:
- * right after listener thread is created but before
+ * right after listener thread is created but before
* listener_os_thread is set, the first worker thread hits an
* error and starts graceful termination
*/
@@ -280,7 +280,7 @@
}
/*
* we should just be able to "kill(ap_my_pid, LISTENER_SIGNAL)" on all
- * platforms and wake up the listener thread since it is the only thread
+ * platforms and wake up the listener thread since it is the only thread
* with SIGHUP unblocked, but that doesn't work on Linux
*/
#ifdef HAVE_PTHREAD_KILL
@@ -399,8 +399,8 @@
/*
* ap_start_shutdown() and ap_start_restart(), below, are a first stab at
- * functions to initiate shutdown or restart without relying on signals.
- * Previously this was initiated in sig_term() and restart() signal handlers,
+ * functions to initiate shutdown or restart without relying on signals.
+ * Previously this was initiated in sig_term() and restart() signal handlers,
* but we want to be able to start a shutdown/restart from other sources --
* e.g. on Win32, from the service manager. Now the service manager can
* call ap_start_shutdown() or ap_start_restart() as appropiate. Note that
@@ -499,7 +499,7 @@
"sigaction(SIGPIPE)");
#endif
- /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy
+ /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy
* processing one */
sigaddset(&sa.sa_mask, SIGHUP);
sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL);
@@ -603,14 +603,14 @@
}
/**
- * XXX If the platform does not have a usable way of bundling
- * accept() with a socket readability check, like Win32,
+ * XXX If the platform does not have a usable way of bundling
+ * accept() with a socket readability check, like Win32,
* and there are measurable delays before the
* socket is readable due to the first data packet arriving,
* it might be better to create the cs on the listener thread
* with the state set to CONN_STATE_CHECK_REQUEST_LINE_READABLE
*
- * FreeBSD users will want to enable the HTTP accept filter
+ * FreeBSD users will want to enable the HTTP accept filter
* module in their kernel for the highest performance
* When the accept filter is active, sockets are kept in the
* kernel until a HTTP request is received.
@@ -734,7 +734,7 @@
rc = apr_pollset_remove(pollset, pfd);
- /*
+ /*
* Some of the pollset backends, like KQueue or Epoll
* automagically remove the FD if the socket is closed,
* therefore, we can accept _SUCCESS or _NOTFOUND,
@@ -747,7 +747,7 @@
rc = ap_queue_push(worker_queue, cs->pfd.desc.s, cs, cs->p);
if (rc != APR_SUCCESS) {
/* trash the connection; we couldn't queue the connected
- * socket to a worker
+ * socket to a worker
*/
apr_bucket_alloc_destroy(cs->bucket_alloc);
apr_socket_close(cs->pfd.desc.s);
@@ -831,7 +831,7 @@
/* POLLSET_SCALE_FACTOR * ap_threads_per_child sets the size of
* the pollset. I've seen 15 connections per active worker thread
- * running SPECweb99.
+ * running SPECweb99.
*
* However, with the newer apr_pollset, this is the number of sockets that
* we will return to any *one* call to poll(). Therefore, there is no
@@ -987,7 +987,7 @@
rc = ap_queue_push(worker_queue, csd, NULL, ptrans);
if (rc != APR_SUCCESS) {
/* trash the connection; we couldn't queue the connected
- * socket to a worker
+ * socket to a worker
*/
apr_socket_close(csd);
ap_log_error(APLOG_MARK, APLOG_CRIT, rc,
@@ -1286,14 +1286,14 @@
}
}
- /* What state should this child_main process be listed as in the
+ /* What state should this child_main process be listed as in the
* scoreboard...?
- * ap_update_child_status_from_indexes(my_child_num, i, SERVER_STARTING,
+ * ap_update_child_status_from_indexes(my_child_num, i, SERVER_STARTING,
* (request_rec *) NULL);
- *
+ *
* This state should be listed separately in the scoreboard, in some kind
- * of process_status, not mixed in with the worker threads' status.
- * "life_status" is almost right, but it's in the worker's structure, and
+ * of process_status, not mixed in with the worker threads' status.
+ * "life_status" is almost right, but it's in the worker's structure, and
* the name could be clearer. gla
*/
apr_thread_exit(thd, APR_SUCCESS);
@@ -1358,8 +1358,8 @@
{
apr_status_t rv, thread_rv;
- start_thread_may_exit = 1; /* tell it to give up in case it is still
- * trying to take over slots from a
+ start_thread_may_exit = 1; /* tell it to give up in case it is still
+ * trying to take over slots from a
* previous generation
*/
rv = apr_thread_join(&thread_rv, start_thread_id);
@@ -1416,7 +1416,7 @@
/* Setup worker threads */
- /* clear the storage; we may not create all our threads immediately,
+ /* clear the storage; we may not create all our threads immediately,
* and we want a 0 entry to indicate a thread which was not created
*/
threads = (apr_thread_t **) calloc(1,
@@ -1459,7 +1459,7 @@
if (one_process) {
/* Block until we get a terminating signal. */
apr_signal_thread(check_signal);
- /* make sure the start thread has finished; signal_threads()
+ /* make sure the start thread has finished; signal_threads()
* and join_workers() depend on that
*/
/* XXX join_start_thread() won't be awakened if one of our
@@ -1504,7 +1504,7 @@
}
}
if (rv == AP_GRACEFUL || rv == AP_RESTART) {
- /* make sure the start thread has finished;
+ /* make sure the start thread has finished;
* signal_threads() and join_workers depend on that
*/
join_start_thread(start_thread_id);
@@ -1674,14 +1674,14 @@
}
}
}
- if (any_dead_threads
- && totally_free_length < idle_spawn_rate
- && free_length < MAX_SPAWN_RATE
+ if (any_dead_threads
+ && totally_free_length < idle_spawn_rate
+ && free_length < MAX_SPAWN_RATE
&& (!ps->pid /* no process in the slot */
|| ps->quiescing)) { /* or at least one is going away */
if (all_dead_threads) {
/* great! we prefer these, because the new process can
- * start more threads sooner. So prioritize this slot
+ * start more threads sooner. So prioritize this slot
* by putting it ahead of any slots with active threads.
*
* first, make room by moving a slot that's potentially still
@@ -1712,7 +1712,7 @@
sick_child_detected = 0;
}
else {
- /* looks like a basket case. give up.
+ /* looks like a basket case. give up.
*/
shutdown_pending = 1;
child_fatal = 1;
@@ -1724,7 +1724,7 @@
return;
}
}
-
+
ap_max_daemons_limit = last_non_dead + 1;
if (idle_thread_count > max_spare_threads) {
@@ -2011,7 +2011,7 @@
ap_reclaim_child_processes(1);
return 1;
- }
+ }
/* we've been told to restart */
apr_signal(SIGHUP, SIG_IGN);
@@ -2042,7 +2042,7 @@
}
else {
- /* Kill 'em all. Since the child acts the same on the parents SIGTERM
+ /* Kill 'em all. Since the child acts the same on the parents SIGTERM
* and a SIGHUP, we may as well use the same signal, because some user
* pthreads are stealing signals from us left and right.
*/
Modified: httpd/httpd/branches/2.2.x/server/mpm/experimental/event/fdqueue.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/experimental/event/fdqueue.c?rev=332309&r1=332308&r2=332309&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/experimental/event/fdqueue.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/experimental/event/fdqueue.c Thu Nov 10 07:20:05 2005
@@ -308,7 +308,7 @@
}
/**
- * Push a new socket onto the queue.
+ * Push a new socket onto the queue.
*
* precondition: ap_queue_info_wait_for_idler has already been called
* to reserve an idle worker thread
@@ -409,7 +409,7 @@
return rv;
}
/* we must hold one_big_mutex when setting this... otherwise,
- * we could end up setting it and waking everybody up just after a
+ * we could end up setting it and waking everybody up just after a
* would-be popper checks it but right before they block
*/
queue->terminated = 1;