Changeset 2195 for branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/common/patches/httpd-suexec-scripts.patch (modified) (2 diffs)

branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch

@@ -314 +314 @@
          exit(121);
      }
-@@ -614,6 +767,23 @@
+@@ -614,6 +767,30 @@
      /*
       * Execute the command, replacing our image with its own.
@@ -331 +331 @@
 +        argv[1] = PHP_PATH;
 +        argv[2] = "-f";
++        /*
++         * argv[3] is the command to run. argv[4] is either an argument or
++         * already null. We don't want to pass any arguments through from
++         * Apache (since they're untrusted), so we chop off the remainder
++         * of argv here.
++         */
++        argv[4] = 0;
 +        execv(PHP_PATH, &argv[1]);
 +        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[1]);