Changeset 873 for server/common/patches/httpd-suexec-scripts.patch

Timestamp:

Nov 8, 2008, 12:20:41 AM (15 years ago)

Author:

andersk

Message:

No more x bit hack.

File:

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

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

@@ -259 +259 @@
          (gid != dir_info.st_gid) ||
          (uid != prg_info.st_uid) ||
-@@ -574,14 +676,15 @@
+@@ -574,12 +676,14 @@
                  prg_info.st_uid, prg_info.st_gid);
          exit(120);
@@ -271 +271 @@
 -    if (!(prg_info.st_mode & S_IXUSR)) {
 +    if (!is_static_extension(cmd) && !is_php_extension(cmd) &&
-+        !(prg_info.st_mode & S_IXGRP)) {
++        !(prg_info.st_mode & S_IXUSR)) {
          log_err("file has no execute permission: (%s/%s)\n", cwd, cmd);
--        exit(121);
-     }
- 
- #ifdef AP_SUEXEC_UMASK
+         exit(121);
+     }
 @@ -606,6 +709,21 @@
        exit(122);