Index: trunk/server/common/patches/httpd-suexec-scripts.patch
===================================================================
--- trunk/server/common/patches/httpd-suexec-scripts.patch	(revision 1474)
+++ trunk/server/common/patches/httpd-suexec-scripts.patch	(revision 1590)
@@ -51,5 +51,5 @@
   */
  
-+#define STATIC_CAT_PATH "/usr/local/bin/static-cat"
++#define STATIC_CAT_PATH "/usr/bin/static-cat"
 +#define PHP_PATH "/usr/bin/php-cgi"
 +
@@ -275,12 +275,15 @@
          exit(121);
      }
-@@ -614,6 +730,20 @@
+@@ -614,6 +730,23 @@
      /*
       * Execute the command, replacing our image with its own.
       */
 +    if (is_static_extension(cmd)) {
-+        argv[2] = STATIC_CAT_PATH;
-+        execv(STATIC_CAT_PATH, &argv[2]);
-+        log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
++        if (setenv("PATH_TRANSLATED", cmd, 1) != 0) {
++            log_err("setenv failed\n");
++            exit(255);
++        }
++        execl(STATIC_CAT_PATH, STATIC_CAT_PATH, (const char *)NULL);
++        log_err("(%d)%s: static-cat exec failed (%s)\n", errno, strerror(errno), STATIC_CAT_PATH);
 +        exit(255);
 +    }