subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1149688 - in /subversion/branches/1.7.x: ./ STATUS subversion/mod_authz_svn/mod_authz_svn.c
Date Fri, 22 Jul 2011 18:37:43 GMT
Author: hwright
Date: Fri Jul 22 18:37:42 2011
New Revision: 1149688

URL: http://svn.apache.org/viewvc?rev=1149688&view=rev
Log:
Merge r1149572 from trunk:

 * r1149572
   Fix mod_authz_svn SEGV with AuthzForceUsernameCase and no authentication.
   Justification:
     It's an unusal, perhaps pointless, configuration but SEGVs are bad.
   Votes:
     +1: philip, rhuijben, hwright

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/mod_authz_svn/mod_authz_svn.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 22 18:37:42 2011
@@ -54,4 +54,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149572

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1149688&r1=1149687&r2=1149688&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 22 18:37:42 2011
@@ -128,13 +128,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1149572
-   Fix mod_authz_svn SEGV with AuthzForceUsernameCase and no authentication.
-   Justification:
-     It's an unusal, perhaps pointless, configuration but SEGVs are bad.
-   Votes:
-     +1: philip, rhuijben, hwright
-
  * r1149675
    Add error checking.
    Justification:

Modified: subversion/branches/1.7.x/subversion/mod_authz_svn/mod_authz_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/mod_authz_svn/mod_authz_svn.c?rev=1149688&r1=1149687&r2=1149688&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/branches/1.7.x/subversion/mod_authz_svn/mod_authz_svn.c Fri Jul 22 18:37:42
2011
@@ -245,7 +245,7 @@ static char *
 get_username_to_authorize(request_rec *r, authz_svn_config_rec *conf)
 {
   char *username_to_authorize = r->user;
-  if (conf->force_username_case)
+  if (username_to_authorize && conf->force_username_case)
     {
       username_to_authorize = apr_pstrdup(r->pool, r->user);
       convert_case(username_to_authorize,



Mime
View raw message