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 17:05:27 UTC
svn commit: r332318 - in /httpd/httpd/branches/2.2.x:
modules/arch/netware/mod_nw_ssl.c modules/http/http_filters.c
modules/ldap/util_ldap_cache_mgr.c server/core.c server/mpm/beos/beos.c
server/mpm/netware/mpm_netware.c server/mpm/winnt/service.c
Author: jim
Date: Thu Nov 10 08:05:09 2005
New Revision: 332318
URL: http://svn.apache.org/viewcvs?rev=332318&view=rev
Log:
No functional change: more indenting/formatting changes due to
tabbing
Modified:
httpd/httpd/branches/2.2.x/modules/arch/netware/mod_nw_ssl.c
httpd/httpd/branches/2.2.x/modules/http/http_filters.c
httpd/httpd/branches/2.2.x/modules/ldap/util_ldap_cache_mgr.c
httpd/httpd/branches/2.2.x/server/core.c
httpd/httpd/branches/2.2.x/server/mpm/beos/beos.c
httpd/httpd/branches/2.2.x/server/mpm/netware/mpm_netware.c
httpd/httpd/branches/2.2.x/server/mpm/winnt/service.c
Modified: httpd/httpd/branches/2.2.x/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/arch/netware/mod_nw_ssl.c?rev=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/branches/2.2.x/modules/arch/netware/mod_nw_ssl.c Thu Nov 10 08:05:09 2005
@@ -314,7 +314,7 @@
int rcode;
struct tlsclientopts sWS2Opts;
struct nwtlsopts sNWTLSOpts;
- struct sslserveropts opts;
+ struct sslserveropts opts;
unsigned long ulFlags;
SOCKET sock;
unicode_t keyFileName[60];
@@ -346,17 +346,17 @@
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 */
- unicpy(keyFileName, L"SSL CertificateIP");
- sWS2Opts.wallet = keyFileName; /* no client certificate */
- sWS2Opts.walletlen = unilen(keyFileName);
+ unicpy(keyFileName, L"SSL CertificateIP");
+ 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 */
Modified: httpd/httpd/branches/2.2.x/modules/http/http_filters.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/http/http_filters.c?rev=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_filters.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_filters.c Thu Nov 10 08:05:09 2005
@@ -795,7 +795,7 @@
if ((rv = ap_setup_client_block(r, body))) {
if (rv == HTTP_REQUEST_ENTITY_TOO_LARGE)
- apr_table_setn(r->notes, "error-notes",
+ apr_table_setn(r->notes, "error-notes",
"TRACE with a request body is not allowed");
return rv;
}
Modified: httpd/httpd/branches/2.2.x/modules/ldap/util_ldap_cache_mgr.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ldap/util_ldap_cache_mgr.c?rev=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/util_ldap_cache_mgr.c Thu Nov 10 08:05:09 2005
@@ -484,7 +484,7 @@
for (n = cache->nodes[i];
n != NULL && n != n->next;
n = n->next) {
- totchainlen++;
+ totchainlen++;
}
}
}
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=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Thu Nov 10 08:05:09 2005
@@ -109,7 +109,7 @@
conf->opts_add = conf->opts_remove = OPT_NONE;
conf->override = dir ? OR_UNSET : OR_UNSET|OR_ALL;
conf->override_opts = OPT_UNSET | OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER
- | OPT_MULTI;
+ | OPT_MULTI;
conf->content_md5 = 2;
conf->accept_path_info = 3;
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=332318&r1=332317&r2=332318&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 08:05:09 2005
@@ -383,7 +383,7 @@
/* 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)");
+ 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
* processing one */
@@ -391,7 +391,7 @@
sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL);
sa.sa_handler = restart;
if (sigaction(SIGHUP, &sa, NULL) < 0)
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGHUP)");
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGHUP)");
if (sigaction(AP_SIG_GRACEFUL, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(" AP_SIG_GRACEFUL_STRING ")");
}
@@ -521,7 +521,7 @@
}
ap_log_error(APLOG_MARK, APLOG_ERR, rv,
ap_server_conf, "apr_pollset_poll: (listen)");
- clean_child_exit(1, worker_slot);
+ clean_child_exit(1, worker_slot);
}
/* We can always use pdesc[0], but sockets at position N
* could end up completely starved of attention in a very
@@ -592,7 +592,7 @@
got_a_black_spot:
}
- apr_pool_destroy(ptrans);
+ apr_pool_destroy(ptrans);
apr_pool_destroy(pworker);
clean_child_exit(0, worker_slot);
@@ -608,7 +608,7 @@
(void) ap_update_child_status_from_indexes(0, slot, SERVER_STARTING, (request_rec*)NULL);
if (one_process) {
- set_signals();
+ set_signals();
ap_scoreboard_image->parent[0].pid = getpid();
ap_scoreboard_image->servers[0][slot].tid = find_thread(NULL);
return 0;
@@ -626,8 +626,8 @@
(void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD,
(request_rec*)NULL);
- sleep(10);
- return -1;
+ sleep(10);
+ return -1;
}
resume_thread(tid);
@@ -703,24 +703,24 @@
last_non_dead = i;
}
- if (i >= ap_max_child_assigned && free_length >= spawn_rate) {
+ if (i >= ap_max_child_assigned && free_length >= spawn_rate) {
break;
- }
+ }
}
ap_max_child_assigned = last_non_dead + 1;
if (free_length > 0) {
- for (i = 0; i < free_length; ++i) {
+ for (i = 0; i < free_length; ++i) {
make_worker(free_slots[i]);
- }
- /* the next time around we want to spawn twice as many if this
- * wasn't good enough, but not if we've just done a graceful
- */
- if (hold_off_on_exponential_spawning) {
- --hold_off_on_exponential_spawning;
- } else if (spawn_rate < MAX_SPAWN_RATE) {
- spawn_rate *= 2;
- }
+ }
+ /* the next time around we want to spawn twice as many if this
+ * wasn't good enough, but not if we've just done a graceful
+ */
+ if (hold_off_on_exponential_spawning) {
+ --hold_off_on_exponential_spawning;
+ } else if (spawn_rate < MAX_SPAWN_RATE) {
+ spawn_rate *= 2;
+ }
} else {
spawn_rate = 1;
}
@@ -747,7 +747,7 @@
/* non-fatal death... note that it's gone in the scoreboard. */
child_slot = -1;
for (i = 0; i < ap_max_child_assigned; ++i) {
- if (ap_scoreboard_image->servers[0][i].tid == pid.pid) {
+ if (ap_scoreboard_image->servers[0][i].tid == pid.pid) {
child_slot = i;
break;
}
Modified: httpd/httpd/branches/2.2.x/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/netware/mpm_netware.c?rev=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/netware/mpm_netware.c Thu Nov 10 08:05:09 2005
@@ -1124,7 +1124,7 @@
printf("Server built: %s\n", ap_get_server_built());
}
else if (!strnicmp("MODULES",&szcommandLine[iCommandLen],3)) {
- ap_show_modules();
+ ap_show_modules();
}
else if (!strnicmp("DIRECTIVES",&szcommandLine[iCommandLen],3)) {
ap_show_directives();
Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/service.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/mpm/winnt/service.c?rev=332318&r1=332317&r2=332318&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/service.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/service.c Thu Nov 10 08:05:09 2005
@@ -231,7 +231,7 @@
/* Create an invisible window */
hwndMain = CreateWindow(wc.lpszClassName,
service_name ? (char *) service_name : "Apache",
- WS_OVERLAPPEDWINDOW & ~WS_VISIBLE,
+ WS_OVERLAPPEDWINDOW & ~WS_VISIBLE,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, NULL, NULL, NULL, NULL);