cvs commit: apache-1.3/src/os/win32/installer apache.iwz

1999-03-19 Thread pcs 
pcs 99/03/19 03:48:58

  Modified:src/os/win32/installer apache.iwz
  Log:
  Update file lists to Apache 1.3.5-dev.
  
  Run the installer DLL before the "Setup Complete" dialog box rather than
  just befoer IS exits. The Setup Complete dialog is the one that prompts
  for a reboot, if necessary, so this should get make the installer run
  before the reboot. See PR 3988.
  
  Update the Apache start menu icons: add icon to shutdown Apache console
  app (-k) and to uninstall Apache service (-u). Rename Start Apache to
  Start Apache as console app, and add the -s option to avoid use of
  the service manager.
  
  Revision  ChangesPath
  1.19  +73 -52apache-1.3/src/os/win32/installer/apache.iwz
  
  Index: apache.iwz
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- apache.iwz1999/01/30 13:03:45 1.18
  +++ apache.iwz1999/03/19 11:48:57 1.19
  @@ -36,7 +36,6 @@
   Version=2.02
   DevTool=Generic Windows
   Platform=Win32
  -DisksBuilt=1
   DisksDir=apache\650MB\
   TabsVisit=0011100011
   LangNum=451
  @@ -99,7 +98,7 @@
   
   [Groups]
   Groups=34
  -Group1Size=513790
  +Group1Size=519176
   Group1Files=9
   Group1Name=Program Executables
   Group1Dir=
  @@ -114,7 +113,7 @@
   Group1File7=C:\Apache\README
   Group1File8=C:\apache\Makefile.tmpl
   Group1File9=C:\apache\README-NT.TXT
  -Group2Size=265216
  +Group2Size=265728
   Group2Files=10
   Group2Name=Additional Modules
   Group2Dir=\modules
  @@ -150,7 +149,7 @@
   Group4TargetOS=-1
   Group4File1=C:\Apache\htdocs\index.html
   Group4File2=C:\apache\htdocs\apache_pb.gif
  -Group5Size=284610
  +Group5Size=285947
   Group5Files=34
   Group5Name=Manual
   Group5Dir=\htdocs\manual
  @@ -204,7 +203,7 @@
   Group6File6=C:\apache\htdocs\manual\images\mod_rewrite_fig1.gif
   Group6File7=C:\apache\htdocs\manual\images\mod_rewrite_fig2.fig
   Group6File8=C:\apache\htdocs\manual\images\mod_rewrite_fig2.gif
  -Group7Size=323537
  +Group7Size=324837
   Group7Files=22
   Group7Name=misc
   Group7Dir=[Manual]\misc
  @@ -232,7 +231,7 @@
   Group7File20=C:\Apache\htdocs\manual\misc\vif-info.html
   Group7File21=C:\Apache\htdocs\manual\misc\windoz_keepalive.html
   Group7File22=C:\apache\htdocs\manual\misc\HTTP_Features.tsv
  -Group8Size=540126
  +Group8Size=546303
   Group8Files=48
   Group8Name=mod
   Group8Dir=[Manual]\mod
  @@ -286,7 +285,7 @@
   Group8File46=C:\Apache\htdocs\manual\mod\mod_userdir.html
   Group8File47=C:\Apache\htdocs\manual\mod\mod_usertrack.html
   Group8File48=C:\apache\htdocs\manual\mod\mod_mmap_static.html
  -Group9Size=109856
  +Group9Size=109947
   Group9Files=13
   Group9Name=vhosts
   Group9Dir=[Manual]\vhosts
  @@ -305,7 +304,7 @@
   Group9File11=C:\Apache\htdocs\manual\vhosts\vhosts-in-depth.html
   Group9File12=C:\Apache\htdocs\manual\vhosts\virtual-host.html
   Group9File13=C:\apache\htdocs\manual\vhosts\mass.html
  -Group10Size=509499
  +Group10Size=516381
   Group10Files=19
   Group10Name=src
   Group10Dir=\src
  @@ -330,7 +329,7 @@
   Group10File17=C:\apache\src\BUILD.NOTES
   Group10File18=C:\apache\src\Makefile_win32.txt
   Group10File19=C:\apache\src\Makefile_win32_debug.txt
  -Group11Size=88267
  +Group11Size=92668
   Group11Files=10
   Group11Name=ap
   Group11Dir=[src]\ap
  @@ -346,7 +345,7 @@
   Group11File8=C:\Apache\src\ap\Makefile.tmpl
   Group11File9=C:\apache\src\ap\ap_fnmatch.c
   Group11File10=C:\apache\src\ap\ap_md5c.c
  -Group12Size=253660
  +Group12Size=254586
   Group12Files=29
   Group12Name=include
   Group12Dir=[src]\include
  @@ -381,7 +380,7 @@
   Group12File27=C:\apache\src\include\ap_config.h
   Group12File28=C:\apache\src\include\ap_ctype.h
   Group12File29=C:\apache\src\include\ap_mmn.h
  -Group13Size=772778
  +Group13Size=786600
   Group13Files=22
   Group13Name=main
   Group13Dir=[src]\main
  @@ -440,7 +439,7 @@
   Group17Update=0
   Group17TargetOS=-1
   Group17File1=C:\Apache\src\modules\extra\Makefile.tmpl
  -Group18Size=204884
  +Group18Size=205717
   Group18Files=11
   Group18Name=proxy
   Group18Dir=[modules]\proxy
  @@ -457,7 +456,7 @@
   Group18File9=C:\apache\src\modules\proxy\proxy_ftp.c
   Group18File10=C:\apache\src\modules\proxy\proxy_http.c
   Group18File11=C:\apache\src\modules\proxy\proxy_util.c
  -Group19Size=861166
  +Group19Size=861768
   Group19Files=36
   Group19Name=standard
   Group19Dir=[modules]\standard
  @@ -530,47 +529,47 @@
   Group20File23=C:\Apache\src\regex\tests
   Group20File24=C:\Apache\src\regex\utils.h
   Group20File25=C:\Apache\src\regex\WHATSNEW
  -Group21Size=195047
  +Group21Size=201986
   Group21Files=28
   Group21Name=support
   Group21Dir=[src]\support
   Group21Update=0
   Group21TargetOS=-1
  -Group21File1=C:\apache\src\support\ab.1
  -Group21File2=C:\apache\src\support\ab.c
  -Group21File3=C:\apache\src\support\apachectl
  -

cvs commit: apache-1.3/src/os/win32 apache.rc apache.ico resource.h

1999-03-19 Thread pcs 
pcs 99/03/19 06:00:19

  Added:   src/os/win32 apache.rc apache.ico resource.h
  Log:
  Add resource files for the main Apache project. Add apache.ico containing
  an Apache icon for the main Apache executable.
  
  Revision  ChangesPath
  1.1  apache-1.3/src/os/win32/apache.rc
  
  Index: apache.rc
  ===
  //Microsoft Developer Studio generated resource script.
  //
  #include "resource.h"
  
  #define APSTUDIO_READONLY_SYMBOLS
  /
  //
  // Generated from the TEXTINCLUDE 2 resource.
  //
  #include "afxres.h"
  
  /
  #undef APSTUDIO_READONLY_SYMBOLS
  
  /
  // Neutral resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
  #ifdef _WIN32
  LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  #pragma code_page(1252)
  #endif //_WIN32
  
  /
  //
  // Icon
  //
  
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
  IDI_APACHE  ICONDISCARDABLE "apache.ico"
  #endif// Neutral resources
  /
  
  
  /
  // English (U.K.) resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
  #ifdef _WIN32
  LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
  #pragma code_page(1252)
  #endif //_WIN32
  
  #ifdef APSTUDIO_INVOKED
  /
  //
  // TEXTINCLUDE
  //
  
  1 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "resource.h\0"
  END
  
  2 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "#include ""afxres.h""\r\n"
  "\0"
  END
  
  3 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "\r\n"
  "\0"
  END
  
  #endif// APSTUDIO_INVOKED
  
  #endif// English (U.K.) resources
  /
  
  
  
  #ifndef APSTUDIO_INVOKED
  /
  //
  // Generated from the TEXTINCLUDE 3 resource.
  //
  
  
  /
  #endif// not APSTUDIO_INVOKED
  
  
  
  
  1.1  apache-1.3/src/os/win32/apache.ico
  
<>
  
  
  1.1  apache-1.3/src/os/win32/resource.h
  
  Index: resource.h
  ===
  //{{NO_DEPENDENCIES}}
  // Microsoft Developer Studio generated include file.
  // Used by Apache.rc
  //
  #define IDI_APACHE  101
  
  // Next default values for new objects
  // 
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_NEXT_RESOURCE_VALUE102
  #define _APS_NEXT_COMMAND_VALUE 40001
  #define _APS_NEXT_CONTROL_VALUE 1000
  #define _APS_NEXT_SYMED_VALUE   101
  #endif
  #endif

cvs commit: apache-1.3/src Apache.mak Apache.dsp

1999-03-19 Thread pcs 
pcs 99/03/19 06:01:05

  Modified:src  Apache.mak Apache.dsp
  Log:
  Add Apache resource file (os/win32/apache.rc) containing an icon for
  the Apache executable.
  
  Revision  ChangesPath
  1.8   +81 -21apache-1.3/src/Apache.mak
  
  Index: Apache.mak
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Apache.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Apache.mak1997/11/25 04:07:09 1.7
  +++ Apache.mak1999/03/19 14:00:59 1.8
  @@ -25,9 +25,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "Apache - Win32 Release"
   
   OUTDIR=.\ApacheR
  @@ -47,6 +44,7 @@
   !ENDIF 
   
   CLEAN :
  + [EMAIL PROTECTED] "$(INTDIR)\apache.res"
[EMAIL PROTECTED] "$(INTDIR)\main_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
  @@ -54,10 +52,44 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheR/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +RSC=rc.exe
  +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "NDEBUG" 
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
   BSC32_SBRS= \
  @@ -68,6 +100,7 @@
/incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\
/out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
  + "$(INTDIR)\apache.res" \
"$(INTDIR)\main_win32.obj"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -94,6 +127,7 @@
   !ENDIF 
   
   CLEAN :
  + [EMAIL PROTECTED] "$(INTDIR)\apache.res"
[EMAIL PROTECTED] "$(INTDIR)\main_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
  @@ -104,29 +138,12 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_CONSOLE"\
/Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheD/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  -BSC32_SBRS= \
  - 
  -LINK32=link.exe
  -LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo 
/subsystem:console\
  - /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\Apache.exe" 
  -LINK32_OBJS= \
  - "$(INTDIR)\main_win32.obj"
   
  -"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -$(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
  $(CPP) @<<
  $(CPP_PROJ) $< 
  @@ -157,6 +174,28 @@
  $(CPP_PROJ) $< 
   <<
   
  +RSC=rc.exe
  +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 
  +BSC32_SBRS= \
  + 
  +LINK32=link.exe
  +LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo 
/subsystem:console\
  + /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
  +LINK32_OBJS= \
  + "$(INTDIR)\apache.res" \
  + "$(INTDIR)\main_win32.obj"
  +
  +"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +$(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 
Debug"
   SOURCE=.\os\win32\main_win32.c
  @@ -164,6 +203,27 @@
   "$(INTDIR)\main_win32.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +SOURCE=.\os\win32\apache.rc
  +DEP_RSC_APACH=\
  + ".\os\win32\apache.ico"\
  + 
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
  +
  +"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
  + $(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "NDEBUG" 
$(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +
  +"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
  + $(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "_DEBUG" 
$(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.8   +8 -0  apache-1.3/src/Apache.dsp
  
  Index: Apache.dsp

cvs commit: apache-apr/pthreads/src/main http_main.c

1999-03-19 Thread rbb 
rbb 99/03/19 06:02:04

  Modified:pthreads/src/main http_main.c
  Log:
  Added some error logging logic.
  
  Revision  ChangesPath
  1.62  +5 -5  apache-apr/pthreads/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- http_main.c   1999/03/17 17:01:20 1.61
  +++ http_main.c   1999/03/19 14:02:03 1.62
  @@ -1811,11 +1811,11 @@
  (request_rec *) NULL);
if (csd >= 0) {
if (queue_push(&csd_queue, csd, &sa_client) != 0) {
  -   /*ap_log_error*/
  - }  
  -  } else{
  -/*   ap_log_error()*/
  -  }
  + ap_log_error(APLOG_MARK, APLOG_ERR, ap_get_server_conf(),
  +  "queue_push:  couldn't put new connection on"
  + "queue");
  + }
  +} 
   }
   ap_update_child_status(my_pid, my_tid, SERVER_DEAD, (request_rec *) 
NULL);
   return NULL;

cvs commit: apache-1.3 README.NT

1999-03-19 Thread pcs 
pcs 99/03/19 07:55:27

  Modified:.README.NT
  Log:
  Make the NT README more consistent with the standard README. Remove
  things which are not really relevant to someone reading this
  file after installing the pre-compiled binary (e.g. "Multithreading
  is not properly abstracted"). Remove <...> from around filenames and URLs.
  
  Revision  ChangesPath
  1.14  +66 -70apache-1.3/README.NT
  
  Index: README.NT
  ===
  RCS file: /export/home/cvs/apache-1.3/README.NT,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- README.NT 1998/10/03 12:25:53 1.13
  +++ README.NT 1999/03/19 15:55:26 1.14
  @@ -1,95 +1,91 @@
  -Apache for Windows
  -   Version 1.3 (and up)
   
  -What is it?
  
  + Apache
  + Version 1.3 (and up)
   
  -Apache is an HTTP server, originally designed for Unix systems. This
  -is the first major release of Apache for Windows systems, including
  -Microsoft Windows NT, 98, and 95.  Like the Unix version, it includes
  -many frequently requested new features, and has an API that allows it
  -to be extended to meet users' needs more easily. It also allows ISAPI
  -extensions.
  +  What is it?
  +  ---
   
  -Documentation
  --
  +  Apache is an HTTP server, originally designed for Unix systems. This
  +  is the version of Apache for Microsoft Windows NT, 98, and 95
  +  systems.  Like the Unix version, it includes many frequently
  +  requested new features, and has an API that allows it to be extended
  +  to meet users' needs more easily. It also allows ISAPI extensions.
   
  -The documentation available as of the date of this release is also
  -included, in HTML format, in the <./htdocs/manual/> directory.
  -For the most up-to-date documentation, visit us on the WWW at
  -. For Windows specific information, see
  -.
   
  -WARNING
  
  +  The Latest Version
  +  --
   
  -Apache on Win32 has not yet been optimized for performance.  Apache still
  -performs best, and is most reliable on Unix platforms.  Over time we
  -will improve performance for Windows NT. Folks doing comparative reviews
  -of webserver performance are asked to compare against Apache on a Unix
  -platform such as Solaris, FreeBSD, or Linux.
  +  Details of the latest version can be found on the Apache HTTP
  +  server project page under http://www.apache.org/.
   
  -Apache on Win32 should still be considered beta quality code.  It does not
  -meet the normal standards of stability and security that Unix releases do.
  +  Documentation
  +  -
   
  -Installation or Compilation Instructions
  -
  +  The documentation available as of the date of this release is
  +  also included, in HTML format, in the htdocs/manual/ directory.
  +  For the most up-to-date documentation can be found on
  +  http://www.apache.org/docs/. For Windows specific information, see
  +  http://www.apache.org/docs/windows.html.
   
  -See the website  for details of
  -how to install Apache from a binary release or how to compile Apache
  -from scratch. This file is also included in the distribution as
  -<./htdocs/manual/windows.html>.
  +  WARNING
  +  ---
   
  -Known Problems
  ---
  +  Apache on Win32 has not yet been optimized for performance.  Apache
  +  still performs best, and is most reliable on Unix platforms.  Over
  +  time we will improve performance for Windows NT. Folks doing
  +  comparative reviews of webserver performance are asked to compare
  +  against Apache on a Unix platform such as Solaris, FreeBSD, or
  +  Linux.
   
  -To get information about the current set of known problems, see our
  -online bug reporting database at .
  -In particular, search for problem reports under the category "os-windows".
  +  Apache on Win32 should still be considered beta quality code.  It
  +  does not meet the normal standards of stability and security that
  +  Unix releases do.
   
  -This is a rough list of what we know has not been implemented on Win32.
  +  Installation
  +  
   
  -- The User directive is not supported. If you run apache as a service,
  -  you can change the user it runs as by going to 
  -  Control Panel->Services->Startup
  +  If you have installed Apache as a pre-compiled binary, you can
  +  now run the server by selecting "Start Apache as console app"
  +  from the Start menu. You can configure Apache for your system
  +  by editing the file conf/httpd.conf in the directory where you
  +  installed Apache.
   
  -- suexec doesn't work
  +  See the http://www.apache.org/docs/windows.html

cvs commit: apache-1.3/htdocs/manual windows.html

1999-03-19 Thread pcs 
pcs 99/03/19 08:02:20

  Modified:htdocs/manual windows.html
  Log:
  Note that Apache may run on Windows 98 (since at least some bug reports
  say they've tried it).
  
  Describe the new Apache Start menu options for starting and stopping
  the Apache console application.
  
  Revision  ChangesPath
  1.26  +10 -8 apache-1.3/htdocs/manual/windows.html
  
  Index: windows.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- windows.html  1999/01/10 05:47:07 1.25
  +++ windows.html  1999/03/19 16:02:19 1.26
  @@ -56,9 +56,9 @@
   Requirements
   
   Apache 1.3 is designed to run on Windows NT 4.0. The binary installer
  -will only work in Intel processors. Apache may also run on Windows 95
  -and Windows NT 3.5.1, but these have not been tested. In all cases
  -TCP/IP networking must be installed.
  +will only work in Intel processors. Apache may also run on Windows 95,
  +Windows 98 and Windows NT 3.5.1, but these have not been tested. In
  +all cases TCP/IP networking must be installed.
   
   
   
  @@ -168,11 +168,13 @@
 NET STOP APACHE
   
   
  -To run Apache from a console window, select the "Apache Server" option
  -from the Start menu. This will open a console window and start Apache
  -running inside it. The window will remain active until you stop
  -Apache. To stop Apache running, see Signalling Apache
  -when Running.
  +To run Apache from a console window, select the "Start Apache as
  +console app" option from the Start menu. This will open a console
  +window and start Apache running inside it. The window will remain
  +active until you stop Apache. To stop Apache running, either select
  +the "Shutdown Apache console app" icon option from the Start menu, or
  +see Signalling Apache when Running
  +for how to control Apache from the command line.

cvs commit: apache-1.3/htdocs/manual windows.html

1999-03-19 Thread pcs 
pcs 99/03/19 08:07:18

  Modified:htdocs/manual windows.html
  Log:
  Note the different Start menu option names between 1.3.4 and 1.3.5.
  
  Revision  ChangesPath
  1.27  +13 -11apache-1.3/htdocs/manual/windows.html
  
  Index: windows.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- windows.html  1999/03/19 16:02:19 1.26
  +++ windows.html  1999/03/19 16:07:18 1.27
  @@ -155,13 +155,13 @@
   
   
   To start Apache as a service, you first need to install it as a
  -service. Run the "Install Apache as Service" option from the Start
  -menu. Once this is done you can start Apache by opening the Services
  -window (in the Control Panel), selecting Apache, then clicking on
  -Start. Apache will now be running in the background. You can later
  -stop Apache by clicking on Stop. As an alternative to using the
  -Services window, you can start and stop Apache from the control line
  -with
  +service. Run the "Install Apache as Service (NT only)" option from the
  +Start menu. Once this is done you can start Apache by opening the
  +Services window (in the Control Panel), selecting Apache, then
  +clicking on Start. Apache will now be running in the background. You
  +can later stop Apache by clicking on Stop. As an alternative to using
  +the Services window, you can start and stop Apache from the control
  +line with
   
   
 NET START APACHE
  @@ -169,12 +169,14 @@
   
   
   To run Apache from a console window, select the "Start Apache as
  -console app" option from the Start menu. This will open a console
  +console app" option from the Start menu (in Apache 1.3.4 and earlier,
  +this option was called "Apache Server"). This will open a console
   window and start Apache running inside it. The window will remain
   active until you stop Apache. To stop Apache running, either select
  -the "Shutdown Apache console app" icon option from the Start menu, or
  -see Signalling Apache when Running
  -for how to control Apache from the command line.
  +the "Shutdown Apache console app" icon option from the Start menu
  +(this is not available in Apache 1.3.4 or earlier), or see Signalling Apache when Running for how
  +to control Apache from the command line.

cvs commit: apache-apr STATUS

1999-03-19 Thread rbb 
rbb 99/03/19 08:32:16

  Modified:.STATUS
  Log:
  I testedd mod_cern_meta again, and it actually does work if the user
  understands what the directives do.  That's one more module down.
  
  Revision  ChangesPath
  1.14  +3 -4  apache-apr/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-apr/STATUS,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- STATUS1999/03/18 21:25:40 1.13
  +++ STATUS1999/03/19 16:32:15 1.14
  @@ -1,5 +1,5 @@
   Apache Portable Runtime STATUS:
  -Last modified at [$Date: 1999/03/18 21:25:40 $]
  +Last modified at [$Date: 1999/03/19 16:32:15 $]
   
   Release:
   
  @@ -32,12 +32,11 @@
   mod_expires.c mod_headers.c mod_so.c mod_setenvif.c 
   mod_auth_anon.c mod_access.c mod_include.c mod_imap.c 
   mod_log_config.c mod_asis.c mod_rewrite.c mod_mime.c 
  -mod_usertrack.c mod_unique_id.c mod_auth.c (I'm assuming 
mod_auth*
  - also work)
  +mod_usertrack.c mod_unique_id.c mod_cern_meta.c
  +mod_auth.c (I'm assuming mod_auth* also work)
   
Modules that don't work:
mod_status.c -- updating the look needs to be finished
  - mod_cern_meta.c  --I can't get this to work on either 1.3 or apr.
mod_mime_magic.c --Doesn't seem to work yet.  More testing needed.
   mod_digest.c --Anybody have a client that can transmit Digest
   Auth?

cvs commit: apache-1.3/src CHANGES

1999-03-19 Thread pcs 
pcs 99/03/19 08:34:47

  Modified:src  CHANGES
  Log:
  Note Win32 changes
  
  Revision  ChangesPath
  1.1284+12 -0 apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1283
  retrieving revision 1.1284
  diff -u -r1.1283 -r1.1284
  --- CHANGES   1999/03/16 16:51:06 1.1283
  +++ CHANGES   1999/03/19 16:34:45 1.1284
  @@ -1,5 +1,17 @@
   Changes with Apache 1.3.5
   
  +  *) WIN32: Binary installer now runs the configuration DLL before
  + the reboot prompt (which is only given if MSVCRT.DLL system
  + DLL is new or updated). This should avoid the configuration
  + directory being empty after installation. [Paul Sutton]
  + PR#3767, 3800, 3827, 3850, 3900, 3953, 3988
  +
  +  *) WIN32: Binary installer now creates Start menu options to start
  + and stop Apache as a console application and to uninstall
  + the Apache service on NT. [Paul Sutton] PR#3741
  +
  +  *) WIN32: Apache.exe now contains an icon. [Paul Sutton]
  +
 *) PORT: Switch back to using fcntl() locking on Linux -- instabilities
have been reported with flock() locking (probably related to kernel
version).  [Dean Gaudet] PR#2723, 3531

cvs commit: apache-1.3/src Makefile_win32.txt Makefile_win32_debug.txt Makefile.nt

1999-03-19 Thread pcs 
pcs 99/03/19 09:01:27

  Modified:src  Makefile_win32.txt Makefile_win32_debug.txt
Makefile.nt
  Log:
  On "make install", copy htpasswd.exe into $(INSTDIR)/bin (this mirrors
  the location of htpasswd on Unix). Add htpasswd to the list of projects
  cleaned during "make clean".
  
  Revision  ChangesPath
  1.3   +5 -0  apache-1.3/src/Makefile_win32.txt
  
  Index: Makefile_win32.txt
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile_win32.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile_win32.txt1999/02/09 18:07:55 1.2
  +++ Makefile_win32.txt1999/03/19 17:01:23 1.3
  @@ -65,6 +65,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
  + -mkdir $(INSTDIR)\bin
copy ApacheR\Apache.exe $(INSTDIR)
copy CoreR\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusR\ApacheModuleStatus.dll 
$(INSTDIR)\modules
  @@ -78,6 +79,7 @@
copy os\win32\ApacheModuleSpelingR\ApacheModuleSpeling.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll 
$(INSTDIR)\modules
copy modules\proxy\Release\ApacheModuleProxy.dll $(INSTDIR)\modules
  + copy support\Release\htpasswd.exe $(INSTDIR)\bin
   
   clean:
cd os\win32
  @@ -88,6 +90,9 @@
cd ..
cd ap
 nmake /nologo CFG="ap - Win32 Release" -f ap.mak clean
  + cd ..
  + cd support
  +  nmake /nologo CFG="htpasswd - Win32 Release" -f htpasswd.mak clean
cd ..
cd main
 nmake /nologo CFG="gen_uri_delims - Win32 Release" -f 
gen_uri_delims.mak clean
  
  
  
  1.3   +5 -0  apache-1.3/src/Makefile_win32_debug.txt
  
  Index: Makefile_win32_debug.txt
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile_win32_debug.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile_win32_debug.txt  1999/02/09 18:07:56 1.2
  +++ Makefile_win32_debug.txt  1999/03/19 17:01:23 1.3
  @@ -65,6 +65,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
  + -mkdir $(INSTDIR)\bin
copy ApacheD\Apache.exe $(INSTDIR)
copy CoreD\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusD\ApacheModuleStatus.dll 
$(INSTDIR)\modules
  @@ -78,6 +79,7 @@
copy os\win32\ApacheModuleSpelingD\ApacheModuleSpeling.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll 
$(INSTDIR)\modules
copy modules\proxy\Debug\ApacheModuleProxy.dll $(INSTDIR)\modules
  + copy support\Debug\htpasswd.exe $(INSTDIR)\bin
   
   clean:
cd os\win32
  @@ -88,6 +90,9 @@
cd ..
cd ap
 nmake /nologo CFG="ap - Win32 Debug" -f ap.mak clean
  + cd ..
  + cd support
  +  nmake /nologo CFG="htpasswd - Win32 Debug" -f htpasswd.mak clean
cd ..
cd main
 nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak 
clean
  
  
  
  1.31  +5 -0  apache-1.3/src/Makefile.nt
  
  Index: Makefile.nt
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.nt,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Makefile.nt   1999/01/26 16:46:25 1.30
  +++ Makefile.nt   1999/03/19 17:01:23 1.31
  @@ -87,6 +87,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
  + -mkdir $(INSTDIR)\bin
copy Apache%SHORT%\Apache.exe $(INSTDIR)
copy Core%SHORT%\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatus%SHORT%\ApacheModuleStatus.dll 
$(INSTDIR)\modules
  @@ -100,6 +101,7 @@
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%\htpasswd.exe $(INSTDIR)\bin
   
   _clean:
cd os\win32
  @@ -110,6 +112,9 @@
cd ..
cd ap
 nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak clean
  + cd ..
  + cd support
  +  nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak clean
cd ..
cd main
 nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f 
gen_uri_delims.mak clean

cvs commit: apache-1.3/src/os/win32/installer apache.iwz

1999-03-19 Thread pcs 
pcs 99/03/19 09:06:08

  Modified:src/os/win32/installer apache.iwz
  Log:
  Add bin/htpasswd.exe as file to be installed.
  
  Revision  ChangesPath
  1.20  +13 -5 apache-1.3/src/os/win32/installer/apache.iwz
  
  Index: apache.iwz
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apache.iwz1999/03/19 11:48:57 1.19
  +++ apache.iwz1999/03/19 17:06:06 1.20
  @@ -36,6 +36,7 @@
   Version=2.02
   DevTool=Generic Windows
   Platform=Win32
  +DisksBuilt=1
   DisksDir=apache\650MB\
   TabsVisit=0011100011
   LangNum=451
  @@ -71,10 +72,10 @@
   
   [Components]
   Components=6
  -Component1Groups=5
  +Component1Groups=6
   Component1Name=Application Files
   Component1Description=Application files needed to run the application
  -Component1GroupList=1 3 24 25 4 
  +Component1GroupList=1 3 24 25 4 35 
   Component2Groups=17
   Component2Name=Source Code
   Component2Description=Source code for Apache and support tools
  @@ -97,8 +98,8 @@
   Component6GroupList=26 28 29 30 
   
   [Groups]
  -Groups=34
  -Group1Size=519176
  +Groups=35
  +Group1Size=345096
   Group1Files=9
   Group1Name=Program Executables
   Group1Dir=
  @@ -113,7 +114,7 @@
   Group1File7=C:\Apache\README
   Group1File8=C:\apache\Makefile.tmpl
   Group1File9=C:\apache\README-NT.TXT
  -Group2Size=265728
  +Group2Size=132608
   Group2Files=10
   Group2Name=Additional Modules
   Group2Dir=\modules
  @@ -810,6 +811,13 @@
   Group34File6=C:\apache\src\os\win32\installer\installdll\test\test.ico
   Group34File7=C:\apache\src\os\win32\installer\installdll\test\test.mak
   Group34File8=C:\apache\src\os\win32\installer\installdll\test\test.rc
  +Group35Size=54272
  +Group35Files=1
  +Group35Name=bin
  +Group35Dir=\bin
  +Group35Update=0
  +Group35TargetOS=-1
  +Group35File1=C:\apache\bin\htpasswd.exe
   
   [Sequence]
   DestinationLocationDir=\Apache Group\Apache

cvs commit: apache-1.3/src/support htpasswd.c

1999-03-19 Thread lars 
lars99/03/19 13:20:49

  Modified:src/support htpasswd.c
  Log:
  make functions static, fix missing prototype warning
  
  Revision  ChangesPath
  1.24  +5 -5  apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- htpasswd.c1999/03/10 20:58:23 1.23
  +++ htpasswd.c1999/03/19 21:20:48 1.24
  @@ -294,7 +294,7 @@
* Check to see if the specified file can be opened for the given
* access.
*/
  -int accessible(char *fname, char *mode)
  +static int accessible(char *fname, char *mode)
   {
   FILE *s;
   
  @@ -309,7 +309,7 @@
   /*
* Return true if a file is readable.
*/
  -int readable(char *fname)
  +static int readable(char *fname)
   {
   return accessible(fname, "r");
   }
  @@ -317,7 +317,7 @@
   /*
* Return true if the specified file can be opened for write access.
*/
  -int writable(char *fname)
  +static int writable(char *fname)
   {
   return accessible(fname, "a");
   }
  @@ -325,7 +325,7 @@
   /*
* Return true if the named file exists, regardless of permissions.
*/
  -int exists(char *fname)
  +static int exists(char *fname)
   {
   #ifdef WIN32
   struct _stat sbuf;
  @@ -346,7 +346,7 @@
* Copy from the current position of one file to the current position
* of another.
*/
  -void copy_file(FILE *target, FILE *source)
  +static void copy_file(FILE *target, FILE *source)
   {
   static char line[MAX_STRING_LEN];

cvs commit: apache-1.3/src/modules/standard mod_negotiation.c

1999-03-19 Thread lars 
lars99/03/19 13:23:26

  Modified:htdocs/manual content-negotiation.html
   src/modules/standard mod_negotiation.c
  Log:
  Update negotiation documentation.
  
  Submitted by: Koen Holtman <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.21  +84 -42apache-1.3/htdocs/manual/content-negotiation.html
  
  Index: content-negotiation.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/content-negotiation.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- content-negotiation.html  1999/02/06 14:00:32 1.20
  +++ content-negotiation.html  1999/03/19 21:23:19 1.21
  @@ -68,6 +68,10 @@
   Apache 1.2 supports 'server driven' content negotiation, as defined in
   the HTTP/1.1 specification. It fully supports the Accept,
   Accept-Language, Accept-Charset and Accept-Encoding request headers.
  +Apache 1.3.4 also supports 'transparent' content negotiation, which is
  +an experimental negotiation protocol defined in RFC 2295 and RFC 2296.
  +It does not offer support for 'feature negotiation' as defined in
  +these RFCs.  
   
   
   A resource is a conceptual entity identified by a URI
  @@ -196,6 +200,11 @@
  type only if the variant isn't too big; specifying a content
  length in the map allows the server to compare against these
  thresholds without checking the actual file.
  +   Description:
  +   A human-readable textual description of the variant.  If Apache cannot
  +   find any appropriate variant to return, it will return an error 
  +   response which lists all available variants instead.  Such a variant
  +   list will include the human-readable variant descriptions.
   
   
   Multiviews
  @@ -242,21 +251,37 @@
   quality rating, which generally causes one of the other views (if any)
   to be retrieved.
   
  -The Negotiation Algorithm
  +The Negotiation Methods
   
   After Apache has obtained a list of the variants for a given resource,
   either from a type-map file or from the filenames in the directory, it
  -applies an algorithm to decide on the 'best' variant to return, if
  -any. To do this it calculates a quality value for each variant in each
  -of the dimensions of variance. It is not necessary to know any of the
  -details of how negotiation actually takes place in order to use Apache's
  -content negotiation features. However the rest of this document
  -explains in detail the algorithm used for those interested.  
  -
  -In some circumstances, Apache can 'fiddle' the quality factor of a
  -particular dimension to achieve a better result. The ways Apache can
  -fiddle quality factors is explained in more detail below.
  +invokes one of two methods to decide on the 'best' variant to
  +return, if any.  It is not necessary to know any of the details of how
  +negotiation actually takes place in order to use Apache's content
  +negotiation features. However the rest of this document explains the
  +methods used for those interested.
  +
  +
  +There are two negotiation methods:
  +
  + 
  +
  +Server driven negotiation with the Apache
  +algorithm is used in the normal case.  The Apache algorithm is
  +explained in more detail below.  When this algorithm is used, Apache
  +can sometimes 'fiddle' the quality factor of a particular dimension to
  +achieve a better result. The ways Apache can fiddle quality factors is
  +explained in more detail below.
  +
  +Transparent content negotiation is used when the
  +browser specifically requests this through the mechanism defined in RFC
  +2295.  This negotiation method gives the browser full control over
  +deciding on the 'best' variant, the result is therefore dependent on
  +the specific algorithms used by the browser.  As part of the
  +transparent negotiation process, the browser can ask Apache to run the
  +'remote variant selection algorithm' defined in RFC 2296.  
   
  +
   Dimensions of Negotiation
   
   
  @@ -287,44 +312,48 @@
   Apache Negotiation Algorithm
   
   
  -Apache uses an algorithm to select the 'best' variant (if any) to
  -return to the browser. This algorithm is not configurable. It operates
  -as follows:
  +Apache can use the following algorithm to select the 'best' variant
  +(if any) to return to the browser.  This algorithm is not
  +further configurable. It operates as follows:
   
   
  -
  -First, for each dimension of the negotiation, the appropriate
  -Accept* header field is checked and a quality assigned to each
  -variant. If the Accept* header for any dimension means that this
  +First, for each dimension of the negotiation, check the appropriate
  +Accept* header field and assign a quality to each
  +variant. If the Accept* header for any dimension implies that this
   variant is not acceptable, eliminate it. If no variants remain, go
   to step 4.
   
  -Select the 'best' variant by a process of elimination. Each of

cvs commit: apache-devsite binaries.html

1999-03-19 Thread lars 
lars99/03/19 14:55:47

  Modified:.binaries.html
  Log:
  Add info about email address.
  
  Revision  ChangesPath
  1.13  +6 -2  apache-devsite/binaries.html
  
  Index: binaries.html
  ===
  RCS file: /export/home/cvs/apache-devsite/binaries.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- binaries.html 1999/03/17 21:24:08 1.12
  +++ binaries.html 1999/03/19 22:55:47 1.13
  @@ -33,17 +33,21 @@
make sure that you rename the directory to reflect the complete
version number, e.g. apache_1.3.5.)
   cd apache_1.3.x
  -./src/helpers/binbuild.sh
  +./src/helpers/binbuild.sh 
   
   
   
  +If you don't specify your email adddress the script will build
  +one for you based on your account and hostname.
   After the execution of binbuild.sh you should see the following
   output:
   
   
   Building Apache 1.3.x binary distribution...
   Platform is "platform"...
  -Binary images successfully created...
  +Binary image successfully created...
  +Server version: Apache/1.3.x (Unix)
  +Server built:   date
   Creating supplementary files...
   Creating distribution archive and readme file...
   Ready.

cvs commit: apache-1.3/src/helpers binbuild.sh

1999-03-19 Thread lars 
lars99/03/19 14:57:31

  Modified:src/helpers binbuild.sh
  Log:
  Add option to let the user specify an email address.
  
  Revision  ChangesPath
  1.8   +12 -3 apache-1.3/src/helpers/binbuild.sh
  
  Index: binbuild.sh
  ===
  RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- binbuild.sh   1999/03/16 23:46:02 1.7
  +++ binbuild.sh   1999/03/19 22:57:30 1.8
  @@ -7,16 +7,22 @@
   # See http://www.apache.org/docs/LICENSE
   
   
  +CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most 
--enable-shared=max"
   APDIR=`pwd`
   APDIR=`basename $APDIR`
   VER=`echo $APDIR |sed s/apache_//`
   OS=`src/helpers/GuessOS`
  -USER="`src/helpers/buildinfo.sh -n [EMAIL PROTECTED]"
   TAR="`src/helpers/PrintPath tar`"
   GTAR="`src/helpers/PrintPath gtar`"
   GZIP="`src/helpers/PrintPath gzip`"
  -CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most 
--enable-shared=max"
   
  +if [ x$1 != x ]
  +then
  +  USER=$1
  +else
  +  USER="`src/helpers/buildinfo.sh -n [EMAIL PROTECTED]"
  +fi
  +
   if [ ! -f ./ABOUT_APACHE ]
   then
 echo "ERROR: The current directory contains no valid Apache distribution."
  @@ -58,8 +64,11 @@
 echo "ERROR: Failed to build Apache. See \"build.log\" for details."
 exit 1;
   fi
  +
  +echo "Binary image successfully created..."
  +
  +./bindist/bin/httpd -v
   
  -echo "Binary images successfully created..."
   echo "Creating supplementary files..."
   
   ( echo " " && \

cvs commit: apache-1.3/src/main http_core.c

1999-03-19 Thread stoddard 
stoddard99/03/19 15:18:02

  Modified:src/main http_core.c
  Log:
  Fix Win32 CGI buffer overflow
  
  Revision  ChangesPath
  1.255 +1 -1  apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.254
  retrieving revision 1.255
  diff -u -r1.254 -r1.255
  --- http_core.c   1999/03/07 15:41:56 1.254
  +++ http_core.c   1999/03/19 23:18:01 1.255
  @@ -865,7 +865,7 @@
   return FileTypeUNKNOWN;
   }
   
  -bResult = ReadFile(hFile, (void*) &buffer, sizeof(buffer), 
  +bResult = ReadFile(hFile, (void*) &buffer, sizeof(buffer) - 1, 
  &nBytesRead, NULL);
   if (!bResult || (nBytesRead == 0)) {
   ap_log_rerror(APLOG_MARK, APLOG_ERR, r,

cvs commit: apache-1.3/src/main http_core.c

1999-03-19 Thread stoddard 
stoddard99/03/19 15:54:10

  Modified:src/main http_core.c
  Log:
  Fix another Win32 CGI bug...
  
  Revision  ChangesPath
  1.256 +1 -1  apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.255
  retrieving revision 1.256
  diff -u -r1.255 -r1.256
  --- http_core.c   1999/03/19 23:18:01 1.255
  +++ http_core.c   1999/03/19 23:54:08 1.256
  @@ -892,7 +892,7 @@
   }
   else {
   /* Check to see if it's a executable */
  -IMAGE_DOS_HEADER *hdr = (IMAGE_DOS_HEADER*)interpreter;
  +IMAGE_DOS_HEADER *hdr = (IMAGE_DOS_HEADER*)buffer;
   if (hdr->e_magic == IMAGE_DOS_SIGNATURE && hdr->e_cblp < 512) {
   fileType = FileTypeEXE;
   }