Skip to content

Commit af3092e

Browse files
jimjagjimjag
committed
No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces and/or tabs are now truly blank lines git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
1 parent 1cece9e commit af3092e

176 files changed

Lines changed: 3861 additions & 3861 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/aaa/mod_auth_basic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static int authenticate_basic_user(request_rec *r)
256256

257257
current_provider = current_provider->next;
258258
} while (current_provider);
259-
259+
260260
if (auth_result != AUTH_GRANTED) {
261261
int return_code;
262262

@@ -280,7 +280,7 @@ static int authenticate_basic_user(request_rec *r)
280280
break;
281281
case AUTH_GENERAL_ERROR:
282282
default:
283-
/* We'll assume that the module has already said what its error
283+
/* We'll assume that the module has already said what its error
284284
* was in the logs.
285285
*/
286286
return_code = HTTP_INTERNAL_SERVER_ERROR;

‎modules/aaa/mod_auth_digest.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* The only problem is that it allows replay attacks when somebody
5252
* captures a packet sent to one server and sends it to another
5353
* one. Should we add "AuthDigestNcCheck Strict"?
54-
* - expired nonces give amaya fits.
54+
* - expired nonces give amaya fits.
5555
*/
5656

5757
#include "apr_sha1.h"
@@ -80,8 +80,8 @@
8080

8181
#include "mod_auth.h"
8282

83-
/* Disable shmem until pools/init gets sorted out
84-
* remove following two lines when fixed
83+
/* Disable shmem until pools/init gets sorted out
84+
* remove following two lines when fixed
8585
*/
8686
#undef APR_HAS_SHARED_MEMORY
8787
#define APR_HAS_SHARED_MEMORY 0
@@ -200,7 +200,7 @@ module AP_MODULE_DECLARE_DATA auth_digest_module;
200200

201201
static apr_status_t cleanup_tables(void *not_used)
202202
{
203-
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
203+
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
204204
"Digest: cleaning up shared memory");
205205
fflush(stderr);
206206

@@ -238,7 +238,7 @@ static apr_status_t initialize_secret(server_rec *s)
238238
if (status != APR_SUCCESS) {
239239
char buf[120];
240240
ap_log_error(APLOG_MARK, APLOG_CRIT, status, s,
241-
"Digest: error generating secret: %s",
241+
"Digest: error generating secret: %s",
242242
apr_strerror(status, buf, sizeof(buf)));
243243
return status;
244244
}
@@ -447,13 +447,13 @@ static const char *add_authn_provider(cmd_parms *cmd, void *config,
447447
digest_config_rec *conf = (digest_config_rec*)config;
448448
authn_provider_list *newp;
449449
const char *provider_name;
450-
450+
451451
if (strcasecmp(arg, "on") == 0) {
452452
provider_name = AUTHN_DEFAULT_PROVIDER;
453453
}
454454
else if (strcasecmp(arg, "off") == 0) {
455455
/* Clear all configured providers and return. */
456-
conf->providers = NULL;
456+
conf->providers = NULL;
457457
return NULL;
458458
}
459459
else {
@@ -540,7 +540,7 @@ static const char *set_nonce_lifetime(cmd_parms *cmd, void *config,
540540
char *endptr;
541541
long lifetime;
542542

543-
lifetime = strtol(t, &endptr, 10);
543+
lifetime = strtol(t, &endptr, 10);
544544
if (endptr < (t+strlen(t)) && !apr_isspace(*endptr)) {
545545
return apr_pstrcat(cmd->pool,
546546
"Invalid time in AuthDigestNonceLifetime: ",
@@ -608,7 +608,7 @@ static const char *set_shmem_size(cmd_parms *cmd, void *config,
608608
char *endptr;
609609
long size, min;
610610

611-
size = strtol(size_str, &endptr, 10);
611+
size = strtol(size_str, &endptr, 10);
612612
while (apr_isspace(*endptr)) endptr++;
613613
if (*endptr == '\0' || *endptr == 'b' || *endptr == 'B') {
614614
;
@@ -645,23 +645,23 @@ static const char *set_shmem_size(cmd_parms *cmd, void *config,
645645

646646
static const command_rec digest_cmds[] =
647647
{
648-
AP_INIT_TAKE1("AuthName", set_realm, NULL, OR_AUTHCFG,
648+
AP_INIT_TAKE1("AuthName", set_realm, NULL, OR_AUTHCFG,
649649
"The authentication realm (e.g. \"Members Only\")"),
650650
AP_INIT_ITERATE("AuthDigestProvider", add_authn_provider, NULL, OR_AUTHCFG,
651651
"specify the auth providers for a directory or location"),
652-
AP_INIT_ITERATE("AuthDigestQop", set_qop, NULL, OR_AUTHCFG,
652+
AP_INIT_ITERATE("AuthDigestQop", set_qop, NULL, OR_AUTHCFG,
653653
"A list of quality-of-protection options"),
654-
AP_INIT_TAKE1("AuthDigestNonceLifetime", set_nonce_lifetime, NULL, OR_AUTHCFG,
654+
AP_INIT_TAKE1("AuthDigestNonceLifetime", set_nonce_lifetime, NULL, OR_AUTHCFG,
655655
"Maximum lifetime of the server nonce (seconds)"),
656-
AP_INIT_TAKE1("AuthDigestNonceFormat", set_nonce_format, NULL, OR_AUTHCFG,
656+
AP_INIT_TAKE1("AuthDigestNonceFormat", set_nonce_format, NULL, OR_AUTHCFG,
657657
"The format to use when generating the server nonce"),
658-
AP_INIT_FLAG("AuthDigestNcCheck", set_nc_check, NULL, OR_AUTHCFG,
658+
AP_INIT_FLAG("AuthDigestNcCheck", set_nc_check, NULL, OR_AUTHCFG,
659659
"Whether or not to check the nonce-count sent by the client"),
660-
AP_INIT_TAKE1("AuthDigestAlgorithm", set_algorithm, NULL, OR_AUTHCFG,
660+
AP_INIT_TAKE1("AuthDigestAlgorithm", set_algorithm, NULL, OR_AUTHCFG,
661661
"The algorithm used for the hash calculation"),
662-
AP_INIT_ITERATE("AuthDigestDomain", set_uri_list, NULL, OR_AUTHCFG,
662+
AP_INIT_ITERATE("AuthDigestDomain", set_uri_list, NULL, OR_AUTHCFG,
663663
"A list of URI's which belong to the same protection space as the current URI"),
664-
AP_INIT_TAKE1("AuthDigestShmemSize", set_shmem_size, NULL, RSRC_CONF,
664+
AP_INIT_TAKE1("AuthDigestShmemSize", set_shmem_size, NULL, RSRC_CONF,
665665
"The amount of shared memory to allocate for keeping track of clients"),
666666
{NULL}
667667
};
@@ -1300,13 +1300,13 @@ static void note_digest_auth_failure(request_rec *r,
13001300
* unneccessarily (it's usually > 200 bytes!).
13011301
*/
13021302

1303-
1303+
13041304
/* don't send domain
13051305
* - for proxy requests
13061306
* - if it's no specified
13071307
*/
13081308
if (r->proxyreq || !conf->uri_list) {
1309-
domain = NULL;
1309+
domain = NULL;
13101310
}
13111311
else {
13121312
domain = conf->uri_list;
@@ -1464,7 +1464,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
14641464
if (dt > conf->nonce_lifetime) {
14651465
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r,
14661466
"Digest: user %s: nonce expired (%.2f seconds old "
1467-
"- max lifetime %.2f) - sending new nonce",
1467+
"- max lifetime %.2f) - sending new nonce",
14681468
r->user, (double)apr_time_sec(dt),
14691469
(double)apr_time_sec(conf->nonce_lifetime));
14701470
note_digest_auth_failure(r, conf, resp, 1);
@@ -1536,7 +1536,7 @@ static const char *new_digest(const request_rec *r,
15361536
}
15371537

15381538

1539-
static void copy_uri_components(apr_uri_t *dst,
1539+
static void copy_uri_components(apr_uri_t *dst,
15401540
apr_uri_t *src, request_rec *r) {
15411541
if (src->scheme && src->scheme[0] != '\0') {
15421542
dst->scheme = src->scheme;
@@ -1684,30 +1684,30 @@ static int authenticate_digest_user(request_rec *r)
16841684
ap_unescape_url(d_uri.query);
16851685
}
16861686
else if (r_uri.query) {
1687-
/* MSIE compatibility hack. MSIE has some RFC issues - doesn't
1687+
/* MSIE compatibility hack. MSIE has some RFC issues - doesn't
16881688
* include the query string in the uri Authorization component
16891689
* or when computing the response component. the second part
16901690
* works out ok, since we can hash the header and get the same
16911691
* result. however, the uri from the request line won't match
1692-
* the uri Authorization component since the header lacks the
1692+
* the uri Authorization component since the header lacks the
16931693
* query string, leaving us incompatable with a (broken) MSIE.
1694-
*
1694+
*
16951695
* the workaround is to fake a query string match if in the proper
16961696
* environment - BrowserMatch MSIE, for example. the cool thing
1697-
* is that if MSIE ever fixes itself the simple match ought to
1697+
* is that if MSIE ever fixes itself the simple match ought to
16981698
* work and this code won't be reached anyway, even if the
16991699
* environment is set.
17001700
*/
17011701

1702-
if (apr_table_get(r->subprocess_env,
1702+
if (apr_table_get(r->subprocess_env,
17031703
"AuthDigestEnableQueryStringHack")) {
1704-
1704+
17051705
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Digest: "
17061706
"applying AuthDigestEnableQueryStringHack "
17071707
"to uri <%s>", resp->raw_request_uri);
17081708

17091709
d_uri.query = r_uri.query;
1710-
}
1710+
}
17111711
}
17121712

17131713
if (r->method_number == M_CONNECT) {
@@ -1800,7 +1800,7 @@ static int authenticate_digest_user(request_rec *r)
18001800
*/
18011801
return HTTP_INTERNAL_SERVER_ERROR;
18021802
}
1803-
1803+
18041804
if (resp->message_qop == NULL) {
18051805
/* old (rfc-2069) style digest */
18061806
if (strcmp(resp->digest, old_digest(r, resp, conf->ha1))) {

‎modules/aaa/mod_authn_alias.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ static authn_status authn_alias_check_password(request_rec *r, const char *user,
5151

5252
const char *provider_name = apr_table_get(r->notes, AUTHN_PROVIDER_NAME_NOTE);
5353
authn_status ret = AUTH_USER_NOT_FOUND;
54-
authn_alias_srv_conf *authcfg =
55-
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
54+
authn_alias_srv_conf *authcfg =
55+
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
5656
&authn_alias_module);
5757

5858
if (provider_name) {
59-
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
59+
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
6060
provider_name, APR_HASH_KEY_STRING);
6161
ap_conf_vector_t *orig_dir_config = r->per_dir_config;
6262

63-
/* If we found the alias provider in the list, then merge the directory
63+
/* If we found the alias provider in the list, then merge the directory
6464
configurations and call the real provider */
6565
if (prvdraliasrec) {
66-
r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
66+
r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
6767
prvdraliasrec->sec_auth);
6868
ret = prvdraliasrec->provider->check_password(r,user,password);
6969
r->per_dir_config = orig_dir_config;
@@ -83,19 +83,19 @@ static authn_status authn_alias_get_realm_hash(request_rec *r, const char *user,
8383

8484
const char *provider_name = apr_table_get(r->notes, AUTHN_PROVIDER_NAME_NOTE);
8585
authn_status ret = AUTH_USER_NOT_FOUND;
86-
authn_alias_srv_conf *authcfg =
87-
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
86+
authn_alias_srv_conf *authcfg =
87+
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
8888
&authn_alias_module);
8989

9090
if (provider_name) {
91-
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
91+
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
9292
provider_name, APR_HASH_KEY_STRING);
9393
ap_conf_vector_t *orig_dir_config = r->per_dir_config;
9494

95-
/* If we found the alias provider in the list, then merge the directory
95+
/* If we found the alias provider in the list, then merge the directory
9696
configurations and call the real provider */
9797
if (prvdraliasrec) {
98-
r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
98+
r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
9999
prvdraliasrec->sec_auth);
100100
ret = prvdraliasrec->provider->get_realm_hash(r,user,realm,rethash);
101101
r->per_dir_config = orig_dir_config;
@@ -131,8 +131,8 @@ static const char *authaliassection(cmd_parms *cmd, void *mconfig, const char *a
131131
char *provider_name;
132132
const char *errmsg;
133133
ap_conf_vector_t *new_auth_config = ap_create_per_dir_config(cmd->pool);
134-
authn_alias_srv_conf *authcfg =
135-
(authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config,
134+
authn_alias_srv_conf *authcfg =
135+
(authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config,
136136
&authn_alias_module);
137137

138138
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -170,7 +170,7 @@ static const char *authaliassection(cmd_parms *cmd, void *mconfig, const char *a
170170
provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool, sizeof(provider_alias_rec));
171171
const authn_provider *provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_name,"0");
172172

173-
/* Save off the new directory config along with the original provider name
173+
/* Save off the new directory config along with the original provider name
174174
and function pointer data */
175175
prvdraliasrec->sec_auth = new_auth_config;
176176
prvdraliasrec->provider_name = provider_name;

‎modules/aaa/mod_authn_anon.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
* as the password.
2121
*
2222
* Just add the following tokes to your <directory> setup:
23-
*
23+
*
2424
* Anonymous magic-userid [magic-userid]...
2525
*
2626
* Anonymous_MustGiveEmail [ on | off ] default = on
2727
* Anonymous_LogEmail [ on | off ] default = on
2828
* Anonymous_VerifyEmail [ on | off ] default = off
2929
* Anonymous_NoUserId [ on | off ] default = off
3030
*
31-
* The magic user id is something like 'anonymous', it is NOT case sensitive.
32-
*
31+
* The magic user id is something like 'anonymous', it is NOT case sensitive.
32+
*
3333
* The MustGiveEmail flag can be used to force users to enter something
3434
* in the password field (like an email address). Default is on.
3535
*
@@ -38,7 +38,7 @@
3838
* in broken GUIs like W95 is often given by the user. The Default is off.
3939
*
4040
* Dirk.vanGulik@jrc.it; http://ewse.ceo.org; http://me-www.jrc.it/~dirkx
41-
*
41+
*
4242
*/
4343

4444
#include "apr_strings.h"
@@ -113,7 +113,7 @@ static const char *anon_set_string_slots(cmd_parms *cmd,
113113

114114
static const command_rec authn_anon_cmds[] =
115115
{
116-
AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG,
116+
AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG,
117117
"a space-separated list of user IDs"),
118118
AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,
119119
(void *)APR_OFFSETOF(authn_anon_config_rec, mustemail),

‎modules/aaa/mod_authn_dbd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void authn_dbd_hooks(apr_pool_t *p)
202202
&authn_dbd_password,
203203
&authn_dbd_realm
204204
};
205-
205+
206206
ap_register_provider(p, AUTHN_PROVIDER_GROUP, "dbd", "0", &authn_dbd_provider);
207207
}
208208
module AP_MODULE_DECLARE_DATA authn_dbd_module =

‎modules/aaa/mod_authn_dbm.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
/*
1818
* http_auth: authentication
19-
*
19+
*
2020
* Rob McCool & Brian Behlendorf.
21-
*
21+
*
2222
* Adapted to Apache by rst.
2323
*
2424
*/
@@ -54,12 +54,12 @@ static void *create_authn_dbm_dir_config(apr_pool_t *p, char *d)
5454
return conf;
5555
}
5656

57-
static const char *set_dbm_type(cmd_parms *cmd,
58-
void *dir_config,
57+
static const char *set_dbm_type(cmd_parms *cmd,
58+
void *dir_config,
5959
const char *arg)
6060
{
6161
authn_dbm_config_rec *conf = dir_config;
62-
62+
6363
conf->dbmtype = apr_pstrdup(cmd->pool, arg);
6464
return NULL;
6565
}
@@ -85,7 +85,7 @@ static apr_status_t fetch_dbm_value(const char *dbmtype, const char *dbmfile,
8585
apr_datum_t key, val;
8686
apr_status_t rv;
8787

88-
rv = apr_dbm_open_ex(&f, dbmtype, dbmfile, APR_DBM_READONLY,
88+
rv = apr_dbm_open_ex(&f, dbmtype, dbmfile, APR_DBM_READONLY,
8989
APR_OS_DEFAULT, pool);
9090

9191
if (rv != APR_SUCCESS) {
@@ -106,7 +106,7 @@ static apr_status_t fetch_dbm_value(const char *dbmtype, const char *dbmfile,
106106
}
107107

108108
apr_dbm_close(f);
109-
109+
110110
return rv;
111111
}
112112

0 commit comments

Comments
 (0)