httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental mod_generic_hook_export.dsp mod_generic_hook_import.dsp mod_generic_hook_export.c mod_generic_hook_export.h mod_generic_hook_import.c
Date Tue, 03 Apr 2001 00:27:19 GMT
wrowe       01/04/02 17:27:18

  Modified:    .        STATUS CHANGES
               modules/experimental mod_generic_hook_export.c
                        mod_generic_hook_export.h mod_generic_hook_import.c
  Added:       modules/experimental mod_generic_hook_export.dsp
                        mod_generic_hook_import.dsp
  Log:
    Here they are, real working examples [well, perhaps working.]
    [Ben Laurie, Will Rowe]
  
  Revision  Changes    Path
  1.214     +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.213
  retrieving revision 1.214
  diff -u -r1.213 -r1.214
  --- STATUS	2001/04/02 22:07:35	1.213
  +++ STATUS	2001/04/03 00:27:08	1.214
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/04/02 22:07:35 $]
  +Last modified at [$Date: 2001/04/03 00:27:08 $]
   
   Release:
   
  @@ -23,13 +23,6 @@
   RELEASE SHOWSTOPPERS:
   
       WARNING: ALWAYS check srclib/apr/STATUS and srclib/apr-util/STATUS
  -
  -    * Generic Hooks are absolutely wrong in linkage, they are declared as
  -      exported from APU, but actually exported from modules.  This needs
  -      heavy fixup, which Bill will do on the plane tommorow.  The actual
  -      'Apache' declaration is in Apache's files, with the 'explicit linkage'
  -      flavor in apr-util.  (Unless you folks will finally buckle and accept
  -      the linkspec in hook declarations.  I'm not holding my breath.)
   
       * Root all file systems with <Directory /> for WIN32/OS2/NW permissions 
           Status: patch brought forward from 1.3.14
  
  
  
  1.156     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- CHANGES	2001/04/02 17:08:02	1.155
  +++ CHANGES	2001/04/03 00:27:09	1.156
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.16-dev
   
  +  *) Make generic hooks to work, with mod_generic_hook_import/export
  +     experimental modules.  [Ben Laurie, Will Rowe]
  +
     *) Fix segfaults for configuration file syntax errors such as
        "<Directory>" followed by "</Directory" and
        "<Directory>" followed by "</Directoryz>".  [Jeff Trawick]
  
  
  
  1.6       +2 -2      httpd-2.0/modules/experimental/mod_generic_hook_export.c
  
  Index: mod_generic_hook_export.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_generic_hook_export.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_generic_hook_export.c	2001/02/16 04:26:37	1.5
  +++ mod_generic_hook_export.c	2001/04/03 00:27:13	1.6
  @@ -57,8 +57,8 @@
   #include "mod_generic_hook_export.h"
   #include "http_protocol.h"
   
  -AP_IMPLEMENT_GENERIC_HOOK_RUN_ALL(int,generic_hook_test,(const char *szStr),
  -				  (szStr),OK,DECLINED)
  +APR_IMPLEMENT_GENERIC_HOOK_RUN_ALL(ap,AP_MODULE,int,generic_hook_test,(const char *szStr),
  +				   (szStr),OK,DECLINED)
   
   static int ExportLogTransaction(request_rec *r)
   {
  
  
  
  1.4       +1 -1      httpd-2.0/modules/experimental/mod_generic_hook_export.h
  
  Index: mod_generic_hook_export.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_generic_hook_export.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_generic_hook_export.h	2001/02/16 04:26:37	1.3
  +++ mod_generic_hook_export.h	2001/04/03 00:27:14	1.4
  @@ -57,6 +57,6 @@
   
   #include "apr_generic_hook.h"
   
  -AP_DECLARE_HOOK(int,generic_hook_test,(const char *))
  +APR_DECLARE_EXTERNAL_HOOK(ap,AP_MODULE,int,generic_hook_test,(const char *))
   
   #endif /* def MOD_GENERIC_HOOK_EXPORT_H */
  
  
  
  1.6       +1 -1      httpd-2.0/modules/experimental/mod_generic_hook_import.c
  
  Index: mod_generic_hook_import.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_generic_hook_import.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_generic_hook_import.c	2001/02/16 04:26:37	1.5
  +++ mod_generic_hook_import.c	2001/04/03 00:27:15	1.6
  @@ -67,7 +67,7 @@
   
   static void ImportRegisterHooks(apr_pool_t *p)
   {
  -    APR_HOOK_GENERIC(generic_hook_test,ImportGenericHookTestHook,NULL,NULL,
  +    APR_HOOK_GENERIC(ap,generic_hook_test,ImportGenericHookTestHook,NULL,NULL,
   		    APR_HOOK_MIDDLE);
   }
   
  
  
  
  1.1                  httpd-2.0/modules/experimental/mod_generic_hook_export.dsp
  
  Index: mod_generic_hook_export.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="mod_generic_hook_export" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=mod_generic_hook_export - Win32 Release
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_generic_hook_export.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_generic_hook_export.mak" CFG="mod_generic_hook_export - Win32 Release"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "mod_generic_hook_export - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "mod_generic_hook_export - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "mod_generic_hook_export - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include"
/I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_generic_hook_export"
/FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_generic_hook_export.so"
/machine:I386
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_generic_hook_export.so"
/machine:I386
  
  !ELSEIF  "$(CFG)" == "mod_generic_hook_export - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_generic_hook_export"
/FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug
/out:"Debug/mod_generic_hook_export.so" /machine:I386
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map/debug /out:"Debug/mod_generic_hook_export.so"
/machine:I386
  
  !ENDIF 
  
  # Begin Target
  
  # Name "mod_generic_hook_export - Win32 Release"
  # Name "mod_generic_hook_export - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\mod_generic_hook_export.c
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  httpd-2.0/modules/experimental/mod_generic_hook_import.dsp
  
  Index: mod_generic_hook_import.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="mod_generic_hook_import" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=mod_generic_hook_import - Win32 Release
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_generic_hook_import.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_generic_hook_import.mak" CFG="mod_generic_hook_import - Win32 Release"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "mod_generic_hook_import - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "mod_generic_hook_import - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "mod_generic_hook_import - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include"
/I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_generic_hook_import"
/FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_generic_hook_import.so"
/machine:I386
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_generic_hook_import.so"
/machine:I386
  
  !ELSEIF  "$(CFG)" == "mod_generic_hook_import - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_generic_hook_import"
/FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug
/out:"Debug/mod_generic_hook_import.so" /machine:I386
  # ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map/debug /out:"Debug/mod_generic_hook_import.so"
/machine:I386
  
  !ENDIF 
  
  # Begin Target
  
  # Name "mod_generic_hook_import - Win32 Release"
  # Name "mod_generic_hook_import - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\mod_generic_hook_import.c
  # End Source File
  # End Target
  # End Project
  
  
  

Mime
View raw message