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 2007/08/06 22:02:28 UTC
svn commit: r563244 - in /httpd/httpd/trunk: modules/aaa/mod_authnz_ldap.c
modules/aaa/mod_authz_host.c modules/aaa/mod_authz_user.c
server/util_script.c
Author: jim
Date: Mon Aug 6 13:02:27 2007
New Revision: 563244
URL: http://svn.apache.org/viewvc?view=rev&rev=563244
Log:
detabify
Modified:
httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
httpd/httpd/trunk/modules/aaa/mod_authz_host.c
httpd/httpd/trunk/modules/aaa/mod_authz_user.c
httpd/httpd/trunk/server/util_script.c
Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?view=diff&rev=563244&r1=563243&r2=563244
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Mon Aug 6 13:02:27 2007
@@ -417,13 +417,13 @@
#ifdef LDAP_SECURITY_ERROR
: (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED
#else
- : (LDAP_INAPPROPRIATE_AUTH == result) ? AUTH_DENIED
- : (LDAP_INVALID_CREDENTIALS == result) ? AUTH_DENIED
+ : (LDAP_INAPPROPRIATE_AUTH == result) ? AUTH_DENIED
+ : (LDAP_INVALID_CREDENTIALS == result) ? AUTH_DENIED
#ifdef LDAP_INSUFFICIENT_ACCESS
: (LDAP_INSUFFICIENT_ACCESS == result) ? AUTH_DENIED
#endif
#ifdef LDAP_INSUFFICIENT_RIGHTS
- : (LDAP_INSUFFICIENT_RIGHTS == result) ? AUTH_DENIED
+ : (LDAP_INSUFFICIENT_RIGHTS == result) ? AUTH_DENIED
#endif
#endif
: AUTH_GENERAL_ERROR;
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_host.c?view=diff&rev=563244&r1=563243&r2=563244
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_host.c Mon Aug 6 13:02:27 2007
@@ -45,7 +45,7 @@
#endif
typedef struct {
- int dummy; /* just here to stop compiler warnings for now. */
+ int dummy; /* just here to stop compiler warnings for now. */
} authz_host_dir_conf;
module AP_MODULE_DECLARE_DATA authz_host_module;
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_user.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_user.c?view=diff&rev=563244&r1=563243&r2=563244
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_user.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_user.c Mon Aug 6 13:02:27 2007
@@ -28,7 +28,7 @@
#include "mod_auth.h"
typedef struct {
- int dummy; /* just here to stop compiler warnings for now. */
+ int dummy; /* just here to stop compiler warnings for now. */
} authz_user_config_rec;
static void *create_authz_user_dir_config(apr_pool_t *p, char *d)
Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?view=diff&rev=563244&r1=563243&r2=563244
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Mon Aug 6 13:02:27 2007
@@ -468,17 +468,17 @@
if (w[0] == '\0') {
int cond_status = OK;
- /* PR#38070: This fails because it gets confused when a
- * CGI Status header overrides ap_meets_conditions.
- *
- * We can fix that by dropping ap_meets_conditions when
- * Status has been set. Since this is the only place
- * cgi_status gets used, let's test it explicitly.
- *
- * The alternative would be to ignore CGI Status when
- * ap_meets_conditions returns anything interesting.
- * That would be safer wrt HTTP, but would break CGI.
- */
+ /* PR#38070: This fails because it gets confused when a
+ * CGI Status header overrides ap_meets_conditions.
+ *
+ * We can fix that by dropping ap_meets_conditions when
+ * Status has been set. Since this is the only place
+ * cgi_status gets used, let's test it explicitly.
+ *
+ * The alternative would be to ignore CGI Status when
+ * ap_meets_conditions returns anything interesting.
+ * That would be safer wrt HTTP, but would break CGI.
+ */
if ((cgi_status == HTTP_UNSET) && (r->method_number == M_GET)) {
cond_status = ap_meets_conditions(r);
}