Ignore:
Timestamp:
Jul 9, 2009, 3:48:21 PM (13 years ago)
Author:
mitchb
Message:
Reintegrate branches/fc11-dev (r1121:1258) to trunk
Location:
trunk
Files:
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/common/patches/httpd-2.2.x-sni.patch

    r1115 r1259  
    971971Index: httpd-2.2.11/docs/manual/mod/mod_ssl.html.en
    972972===================================================================
    973 --- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (revision 768863)
    974 +++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (working copy)
     973--- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2008-08-20 19:02:48.000000000 -0400
     974+++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2009-06-03 05:33:23.000000000 -0400
    975975@@ -75,6 +75,7 @@ to provide the cryptography engine.</p>
    976976 <li><img alt="" src="../images/down.gif" /> <a href="#sslrequiressl">SSLRequireSSL</a></li>
     
    10261026+<p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
    10271027 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
    1028  </body></html>
     1028-</body></html>
     1029\ No newline at end of file
     1030+</body></html>
  • trunk/server/common/patches/httpd-suexec-scripts.patch

    r1169 r1259  
    4545 APACHE_HELP_STRING(--with-suexec-docroot,SuExec root directory),[
    4646   AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] )
    47 --- httpd-2.2.2/support/suexec.c.old    2006-04-21 21:53:06.000000000 -0400
    48 +++ httpd-2.2.2/support/suexec.c        2007-05-22 10:32:04.000000000 -0400
     47--- httpd-2.2.11/support/suexec.c.old   2008-11-30 10:47:31.000000000 -0500
     48+++ httpd-2.2.11/support/suexec.c       2009-06-08 09:02:17.000000000 -0400
    4949@@ -30,6 +30,9 @@
    5050  *
     
    5757 #include "ap_config.h"
    5858 #include "suexec.h"
    59 @@ -46,6 +48,7 @@
     59@@ -46,6 +49,7 @@
    6060 #include <stdio.h>
    6161 #include <stdarg.h>
     
    6565 #ifdef HAVE_PWD_H
    6666 #include <pwd.h>
    67 @@ -95,6 +98,7 @@
     67@@ -95,6 +99,7 @@
    6868 {
    6969     /* variable name starts with */
     
    146146     clean_env();
    147147+    setenv("JAVA_TOOL_OPTIONS", "-Xmx128M", 1); /* scripts.mit.edu local hack */
    148 
     148 
    149149     prog = argv[0];
    150150     /*
    151 @@ -350,6 +406,20 @@
     151@@ -350,6 +414,20 @@
    152152 #endif /*_OSD_POSIX*/
    153153 
     
    170170      * or attempts to back up out of the current directory,
    171171      * to protect against attacks.  If any are
    172 @@ -371,6 +441,7 @@
     172@@ -371,6 +449,7 @@
    173173         userdir = 1;
    174174     }
     
    178178      * Error out if the target username is invalid.
    179179      */
    180 @@ -450,7 +521,7 @@
     180@@ -452,7 +531,7 @@
    181181      * Error out if attempt is made to execute as root or as
    182182      * a UID less than AP_UID_MIN.  Tsk tsk.
     
    187187         exit(107);
    188188     }
    189 @@ -482,6 +553,21 @@
     189@@ -484,6 +563,21 @@
    190190         log_err("failed to setuid (%ld: %s)\n", uid, cmd);
    191191         exit(110);
     
    209209     /*
    210210      * Get the current working directory, as well as the proper
    211 @@ -504,6 +588,21 @@
     211@@ -506,6 +600,21 @@
    212212             log_err("cannot get docroot information (%s)\n", target_homedir);
    213213             exit(112);
     
    231231     else {
    232232         if (((chdir(AP_DOC_ROOT)) != 0) ||
    233 @@ -530,15 +629,17 @@
     233@@ -532,15 +641,17 @@
    234234     /*
    235235      * Error out if cwd is writable by others.
     
    250250         exit(117);
    251251     }
    252 @@ -546,10 +647,12 @@
     252@@ -548,10 +659,12 @@
    253253     /*
    254254      * Error out if the program is writable by others.
     
    263263     /*
    264264      * Error out if the file is setuid or setgid.
    265 @@ -563,6 +666,7 @@
     265@@ -565,6 +678,7 @@
    266266      * Error out if the target name/group is different from
    267267      * the name/group of the cwd or the program.
     
    271271         (gid != dir_info.st_gid) ||
    272272         (uid != prg_info.st_uid) ||
    273 @@ -574,12 +678,14 @@
     273@@ -576,16 +690,33 @@
    274274                 prg_info.st_uid, prg_info.st_gid);
    275275         exit(120);
     
    287287         exit(121);
    288288     }
    289 @@ -606,6 +711,21 @@
    290        exit(122);
    291      }
    292289 
    293290+    if (is_static_extension(cmd)) {
    294291+        argv[2] = STATIC_CAT_PATH;
    295292+        execv(STATIC_CAT_PATH, &argv[2]);
    296 +       log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
    297 +       exit(255);
     293+        log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
     294+        exit(255);
    298295+    }
    299296+    if (is_php_extension(cmd)) {
     
    302299+        argv[2] = "-f";
    303300+        execv(PHP_PATH, &argv[1]);
    304 +       log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
    305 +       exit(255);
    306 +    }
    307 +
    308      /*
    309       * Execute the command, replacing our image with its own.
    310       */
     301+        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[2]);
     302+        exit(255);
     303+    }
     304+
     305 #ifdef AP_SUEXEC_UMASK
     306     /*
     307      * umask() uses inverse logic; bits are CLEAR for allowed access.
  • trunk/server/common/patches/openafs-scripts.patch

    r1134 r1259  
    127127     short multiPage;           /* count of multi-page getpages in progress */
    128128 #endif
    129 +    bool apache_access;                /* whether or not Apache has access to a file */
     129+    int apache_access;         /* whether or not Apache has access to a file */
    130130 };
    131131 
Note: See TracChangeset for help on using the changeset viewer.