Changeset 1589 for trunk/server/common/oursrc

Timestamp:

Jul 17, 2010, 6:53:37 PM (14 years ago)

Author:

andersk

Message:

mod_vhost_ldap: Fix /~user URLs.

This also re-enables the upstream apacheScriptAlias handling that was
previously disabled for no good reason (we don’t use it, but its
existence isn’t harmful), and fixes the same problem in it.  The patch
has been sent upstream to http://bugs.debian.org/589461 .

File:

• trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c (modified) (5 diffs)

trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c

@@ -454 +454 @@
     int sleep;
     struct berval hostnamebv, shostnamebv;
+    int ret = DECLINED;
 
     reqc =
@@ -608 +609 @@
     cgi = NULL;
 
-#if 0
     if (reqc->cgiroot) {
         cgi = strstr(r->uri, "cgi-bin/");
@@ -625 +625 @@
           r->handler = "cgi-script";
           apr_table_setn(r->notes, "alias-forced-type", r->handler);
+          ret = OK;
         }
-#endif
-    /* This is a quick, dirty hack. I should be shot for taking 6.170
-     * this term and being willing to write a quick, dirty hack. */
-    
-    if (strncmp(r->uri, "/~", 2) == 0) {
+    } else if (strncmp(r->uri, "/~", 2) == 0) {
+        /* This is a quick, dirty hack. I should be shot for taking 6.170
+         * this term and being willing to write a quick, dirty hack. */    
         char *username;
         uid_t uid = (uid_t)atoll(reqc->uid);
@@ -648 +647 @@
             }
             r->filename = apr_pstrcat(r->pool, homedir, "/", USERDIR, r->uri + 2 + strlen(username), NULL);
+            ret = OK;
         }
     } else if (r->uri[0] == '/') {
@@ -713 +713 @@
 
     /* Hack to allow post-processing by other modules (mod_rewrite, mod_alias) */
-    return DECLINED;
+    return ret;
 }