Changeset 1355 for trunk/server

Timestamp:

Nov 9, 2009, 11:14:31 PM (15 years ago)

Author:

andersk

Message:

suexec: Exec static-cat or php-cgi after closing the suexec log.

File:

• trunk/server/common/patches/httpd-suexec-scripts.patch (modified) (3 diffs)

trunk/server/common/patches/httpd-suexec-scripts.patch

@@ -271 +271 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -576,16 +690,33 @@
+@@ -576,12 +690,14 @@
                  prg_info.st_uid, prg_info.st_gid);
          exit(120);
@@ -287 +287 @@
          exit(121);
      }
- 
+@@ -614,6 +730,20 @@
+     /*
+      * Execute the command, replacing our image with its own.
+      */
 +    if (is_static_extension(cmd)) {
 +        argv[2] = STATIC_CAT_PATH;
@@ -302 +305 @@
 +        exit(255);
 +    }
-+
- #ifdef AP_SUEXEC_UMASK
-     /*
-      * umask() uses inverse logic; bits are CLEAR for allowed access.
+ #ifdef NEED_HASHBANG_EMUL
+     /* We need the #! emulation when we want to execute scripts */
+     {