Commit 9b60e22b authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Grab these trunk fixes: 

   r422306: gen_test_char doesn't need util_debug
  r1089950: don't build checkgid on MinGW
  r1089951: rework choice of CGI implementation
  r1089954: gcc compatibility of win32/os.h
  r1090417: include <stdlib.h> in win32/os.h before creating exit() macro
            a few other tiny bits of code and svn:ignore entries
 
Submitted by: John Vandenberg <jayvdb gmail.com>, others
Reviewed by: trawick, fuangk, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1092390 13f79535-47bb-0310-9956-ffa450edef68
parent f3067d11

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.18



  *) MinGW build improvements.  PR 49535.  [John Vandenberg 

     <jayvdb gmail.com>, Jeff Trawick]



  *) mod_ssl, ab: Support OpenSSL compiled without SSLv2 support.

     [Stefan Fritsch]

STATUS

+0 −12
Original line number Diff line number Diff line
@@ -96,18 +96,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.2.x patch: Trunk version of patch works with fuzz

     +1: sf, trawick, wrowe



  * Critical MinGW build issues, svn:ignore

     This serves pages and doesn't have junk in "svn status" output ;)

     Trunk:

          r422306: gen_test_char doesn't need util_debug

         r1089950: don't build checkgid on MinGW

         r1089951: rework choice of CGI implementation

         r1089954: gcc compatibility of win32/os.h

         r1090417: include <stdlib.h> in win32/os.h before creating exit() macro

          a few other tiny bits of code and svn:ignore entries

     2.2.x patch: http://people.apache.org/~trawick/mingw_april_10.txt

     +1: trawick, wrowe, fuankg



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

include/ap_config.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 
        APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)



#include "os.h"

#if !defined(WIN32) && !defined(NETWARE)

#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)

#include "ap_config_auto.h"

#include "ap_config_layout.h"

#endif

modules/generators/config5.m4

+21 −6
Original line number Diff line number Diff line
@@ -11,15 +11,30 @@ APACHE_MODULE(info, server information, , , most) 
APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [

              other_targets=suexec ] )



# Is mod_cgid needed?

case $host in

    *mingw*)

        dnl No fork+thread+fd issues, and cgid doesn't work anyway.

        cgid_needed="no"

        ;;

    *)

        if ap_mpm_is_threaded; then

# if we are using a threaded MPM, we will get better performance with

# mod_cgid, so make it the default.

            dnl if we are using a threaded MPM on Unix, we can get better

            dnl performance with mod_cgid, and also avoid potential issues

            dnl with forking from a threaded process.

            cgid_needed="yes"

        else

            dnl if we are using a non-threaded MPM, it makes little sense to

            dnl use mod_cgid, and it just opens up holes we don't need.

            cgid_needed="no"

        fi

        ;;

esac



if test $cgid_needed = "yes"; then

    APACHE_MODULE(cgid, CGI scripts, , , yes)

    APACHE_MODULE(cgi, CGI scripts, , , no)

else

# if we are using a non-threaded MPM, it makes little sense to use

# mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the

# default

    APACHE_MODULE(cgi, CGI scripts, , , yes)

    APACHE_MODULE(cgid, CGI scripts, , , no)

fi

os/win32/Makefile.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 


LTLIBRARY_NAME    = libos.la

LTLIBRARY_SOURCES = util_win32.c ap_regkey.c modules.c



include $(top_srcdir)/build/ltlib.mk