Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 72717 invoked by uid 500); 6 Jun 2000 05:20:54 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 72704 invoked from network); 6 Jun 2000 05:20:52 -0000 From: "Andrew Braund" To: Subject: [PATCH] RE: cvs commit: apache-1.3/src/os/win32 service.c service.h Date: Tue, 6 Jun 2000 14:45:51 +0930 Message-ID: <000001bfcf76$4878f380$3c00a8c0@beast> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook 8.5, Build 4.71.2173.0 In-Reply-To: <000901bfcf1d$64c31150$345985d0@corecomm.net> Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6600 X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N This is my first attempt at a patch so please be gentle! I thought I would start with some changes to win_compiling.html. The changes mainly cater for the novice user. I have just seen a new version (apache-1.3_20000606041200.tar.gz) so will download it and start testing the new service stuff on 95 and add something to the windows.html documentation. I downloaded apache-1.3_20000605221200.tar.gz then compiled (command line style) following instructions in windows.html and win_compiling.html. This went very well, a new user would get a good first impression. Other Comments; Makefile.win is a Windows (only) make file so why can't it copy the conf\*.conf-dist-win, conf\mime.types, conf\magic and htdocs\*.* files to the ServerRoot directory? Would this be a good thing/worth doing? PS; Many thanks to Mr William Rowe for all his effort on the Windows code, and sorry for complaining :(. > -----Original Message----- > From: William A. Rowe, Jr. [mailto:wrowe@lnd.com] > Sent: Tuesday, 6 June 2000 4:09 > To: new-httpd@apache.org > Subject: RE: cvs commit: apache-1.3/src/os/win32 service.c service.h > > > > From: wrowe@locus.apache.org [mailto:wrowe@locus.apache.org] > > Sent: Monday, June 05, 2000 1:05 PM > > > > Index: STATUS > > =================================================================== > > + * Assure the windows.html reflects reality, today. > > + - running the service as a user other than SYSTEM (NT/2000). > > + - CONDITIONALLY - if someone posts revisions to the list for > > + htdocs/manual/windows.html to properly document JJK's Win95 > > + services support as a -HIGHLY EXPERIMENTAL- patch, > > + OtherBill will include that patch (with -k runservice rather > > + than -s, not documented in the -h list of options, and with > > + FreeConsole() -following- successful parsing of httpd.conf). > > + Too many are complaining, -but- 3+ Win95 users must step up > > + to test this new patch offered late Mon eve before we proceed. > > Ok, explanation... > > I've had several sideband comments about this side of JJK's patch. It took > considerable rework to get it to integrate well into 2.0, but I did start > in my devel 1.3.x tree. So it is already there. > > If those who want this patch applied will speak up to the list, and one will > offer a patch to the windows.html docs to bring that up to this patch, > and several will commit to testing the revised patch, I'll go for it. > > HOWEVER, it must be clearly marked -HIGHLY EXPERIMENTAL- (for this rev). > If it works well, and we don't see the complaints, then we will remove > that caviat for 2.0 :-) We must warn them that if it works -at all- we > can not attest to it's reliability or future support of that feature. > > My original thought - "This is a new feature"... didn't hold water. If we > are going to deploy in 2.0, why not get it tested in 1.3.13? That affords > us the best confidence in a clean 2.0 release. Also, several complained > that they were needing that feature now, not in several months or whenever > 2.0 gets rolling into beta. [beta 2.0 should be stronger than Win32 1.3!] > --- win_compiling.html Thu May 11 13:09:18 2000 +++ updated_win_compiling.html Tue Jun 6 12:28:38 2000 @@ -20,7 +20,7 @@ See Using Apache with Microsoft Windows before you begin.

-

Compiling Apache requires Microsoft Visual C++ 5.0 to be properly +

Compiling Apache requires Microsoft Visual C++ 5.0 (or 6.0) to be properly installed. It is easiest to compile with the command-line tools (nmake, etc...). Consult the VC++ manual to determine how to install them. Be especially aware that the vcvars32.bat file @@ -43,6 +43,12 @@ information in the resulting files, making it easier to find bugs and track down problems.

+

If you get an error such as "the name specified is not recognized..." + then you need to run vcvars32.bat first. Enter the following command;
+ "D:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
+ (you will need to adjust this so it matches where your VC was installed) then + try the nmake command again.

+

Apache can also be compiled using VC++'s Visual Studio development environment. To simplify this process, a Visual Studio workspace, Apache.dsw, is provided in the src folder. This workspace exposes @@ -95,28 +101,28 @@ root directory. The default is the \Apache directory, on the current hard drive.

-

To install the files into the \Apache directory +

To install the files into the c:\ApacheRoot directory automatically, use one the following nmake commands (see above):

    -
  • nmake /f Makefile.win installr INSTDIR=dir +
  • nmake /f Makefile.win installr INSTDIR=c:\ApacheRoot (for release build) -
  • nmake /f Makefile.win installd INSTDIR=dir +
  • nmake /f Makefile.win installd INSTDIR=c:\ApacheRoot (for debug build)
-The dir argument to INSTDIR gives the installation directory; it can -be omitted if Apache is to be installed into \Apache. +The c:\ApacheRoot argument to INSTDIR gives the installation directory (it can +be omitted if Apache is to be installed into \Apache).

This will install the following:

    -
  • dir\Apache.exe - Apache executable -
  • dir\ApacheCore.dll - Main Apache shared library -
  • dir\modules\ApacheModule*.dll - Loadable Apache +
  • c:\ApacheRoot\Apache.exe - Apache executable +
  • c:\ApacheRoot\ApacheCore.dll - Main Apache shared library +
  • c:\ApacheRoot\modules\ApacheModule*.dll - Loadable Apache modules -
  • dir\bin\*.exe - Administrator support executables -
  • dir\conf - Empty configuration directory -
  • dir\logs - Empty logging directory +
  • c:\ApacheRoot\bin\*.exe - Administrator support executables +
  • c:\ApacheRoot\conf - Empty configuration directory +
  • c:\ApacheRoot\logs - Empty logging directory

If you do not have nmake, or wish to install in a different directory, @@ -140,10 +146,23 @@

Before running the server you must fill out the conf directory. Copy the *.conf-dist-win from the distribution conf directory -and rename *.conf. Edit the @@ServerRoot@@ entries to your -actual server root (for example "C:\apache"). Copy over -the conf/magic and conf/mime.types files as well. +and rename them to *.conf. You will need to copy over the +conf/magic and conf/mime.types files as well. In order to serve documents +you will need to create a htdocs\index.html or just copy over the standard Apache +ones (This is a good idea as then you get the full Apache documention on line).
+The following commands will do this;
+xcopy c:\Apache\conf\*.conf-dist-win c:\ApacheRoot\conf\*.conf
+xcopy c:\Apache\conf\magic c:\ApacheRoot\conf\
+xcopy c:\Apache\conf\mime.types c:\ApacheRoot\conf\
+xcopy c:\Apache\htdocs\*.* c:\ApacheRoot\htdocs\ /E
+(adjust these so c:\ApacheRoot matches the INSTDIR used above) + +

+Edit the @@ServerRoot@@ entries in c:\ApacheRoot\conf\httpd.conf to your +actual server root (for example "c:/ApacheRoot" Note: you must use forward +slashes in Apache configuration files).
+