Commit f223d89d authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Win32: 

  install ab.exe
  fix dependency in Apache.dsw (ab is dependent on aprlib and ap)
  fix ab and htdigest projects so that they find all header files
  define ap_signal() in apr.hw - this is o.k. for casual use as with
    cmd-line programs
  use API_VAR_EXPORT as appropriate in getopt.c
general:
  ab doesn't need to declare ap_optarg/ap_optind; fix a warning
  htdigest needs to call ap_initialize() to avoid segfault at
    startup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85080 13f79535-47bb-0310-9956-ffa450edef68
parent 40dbf378

Apache.dsw

+9 −0
Original line number Diff line number Diff line
@@ -323,6 +323,9 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name logresolve

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name ab

    End Project Dependency

}}}



###############################################################################
@@ -335,6 +338,12 @@ Package=<5> 


Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name aprlib

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name ap

    End Project Dependency

}}}



###############################################################################

Makefile.win

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ _install: 
	copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules

	copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules

#       copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules

        copy support\$(LONG)\ab.exe $(INSTDIR)\bin

        copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin

	copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin

	copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin

support/ab.c

+3 −5
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ struct data { 
#define ap_max(a,b) ((a)>(b))?(a):(b)



/* --------------------- GLOBALS ---------------------------- */

API_VAR_IMPORT char *ap_optarg; /* argument associated with option */

API_VAR_IMPORT int  ap_optind;



int verbosity = 0;        	/* no verbosity by default */

int posting = 0;        	/* GET by default */
@@ -840,14 +838,14 @@ static void test(void) 
static void copyright(void)

{

    if (!use_html) {

        printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.10 $> apache-2.0");

        printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.11 $> apache-2.0");

        printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");

        printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");

        printf("\n");

    }

    else {

        printf("<p>\n");

        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", VERSION, "$Revision: 1.10 $");

        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", VERSION, "$Revision: 1.11 $");

        printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");

        printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");

        printf("</p>\n<p>\n");
@@ -1071,5 +1069,5 @@ int main(int argc, char **argv) 
    copyright();

    test();



    exit(0);

    return 0;

}

support/ab.dsp

+2 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ CFG=ab - Win32 Debug 
!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "ab - Win32 Release" (based on\

 "Win32 (x86) Console Application")

!MESSAGE "ab - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "ab - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE
@@ -42,8 +41,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT CPP /YX

# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib\apr\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

support/htdigest.c

+3 −1
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ int main(int argc, char *argv[]) 
    char command[MAX_STRING_LEN];

    int found;

   

    ap_initialize();

    atexit(ap_terminate); 

    ap_create_pool(&cntxt, NULL);



    tn = NULL;