From: Rich Bowen Date: Tue, 23 Mar 2010 00:20:56 +0000 (+0000) Subject: 'Apache' => 'Apache HTTP Server' etc X-Git-Tag: 2.3.6~310 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c8d5685af08ae80d6d8efab6f4a0691604826a0;p=apache 'Apache' => 'Apache HTTP Server' etc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926413 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en index cf9e4a3766..43dbf0d193 100644 --- a/docs/manual/mod/mod_so.html.en +++ b/docs/manual/mod/mod_so.html.en @@ -38,7 +38,7 @@ Windows

On selected operating systems this module can be used to - load modules into Apache at runtime via the Dynamic Shared Object (DSO) mechanism, + load modules into Apache HTTP Server at runtime via the Dynamic Shared Object (DSO) mechanism, rather than requiring a recompilation.

On Unix, the loaded code typically comes from shared object @@ -47,9 +47,11 @@ Windows extension.

Warning

-

Apache 1.3 modules cannot be directly used - with Apache 2.0 - the module must be modified to dynamically - load or compile into Apache 2.0.

+

Modules built for one major version of the Apache HTTP Server + will generally not work on another. (e.g. 1.3 vs. 2.0, or 2.0 vs. + 2.2) There are usually API changes between one major version and + another that require that modules be modified to work with the new + version.

Directives

@@ -67,7 +69,7 @@ Windows

Note

The module name format changed for Windows - with Apache 1.3.15 and 2.0 - the modules are now named as + with Apache HTTP Server 1.3.15 and 2.0 - the modules are now named as mod_foo.so

While mod_so still loads modules with @@ -75,7 +77,7 @@ Windows preferred; if you are converting your loadable module for 2.0, please fix the name to this 2.0 convention.

-

The Apache module API is unchanged between the Unix and +

The Apache httpd module API is unchanged between the Unix and Windows versions. Many modules will run on Windows with no or little change from Unix, although others rely on aspects of the Unix architecture which are not present in Windows, and will @@ -83,8 +85,8 @@ Windows

When a module does work, it can be added to the server in one of two ways. As with Unix, it can be compiled into the - server. Because Apache for Windows does not have the - Configure program of Apache for Unix, the module's + server. Because Apache httpd for Windows does not have the + Configure program of Apache httpd for Unix, the module's source file must be added to the ApacheCore project file, and its symbols must be added to the os\win32\modules.c file.

@@ -93,14 +95,14 @@ Windows library that can be loaded into the server at runtime, using the LoadModule directive. These module DLLs can be distributed and run on any - Apache for Windows installation, without recompilation of the + Apache httpd for Windows installation, without recompilation of the server.

To create a module DLL, a small change is necessary to the module's source file: The module record must be exported from the DLL (which will be created later; see below). To do this, add the AP_MODULE_DECLARE_DATA (defined in the - Apache header files) to your module's module record definition. + Apache httpd header files) to your module's module record definition. For example, if your module has:

@@ -121,7 +123,7 @@ Windows link this against the libhttpd.lib export library that is created when the libhttpd.dll shared library is compiled. You may also have to change the compiler settings to ensure that - the Apache header files are correctly located. You can find + the Apache httpd header files are correctly located. You can find this library in your server root's modules directory. It is best to grab an existing module .dsp file from the tree to assure the build environment is configured correctly, or diff --git a/docs/manual/mod/mod_so.xml b/docs/manual/mod/mod_so.xml index dbd9fa6693..c28bc90dc9 100644 --- a/docs/manual/mod/mod_so.xml +++ b/docs/manual/mod/mod_so.xml @@ -34,7 +34,7 @@ Windows

On selected operating systems this module can be used to - load modules into Apache at runtime via the Dynamic Shared Object (DSO) mechanism, rather than requiring a recompilation.

@@ -44,9 +44,11 @@ Windows extension.

Warning -

Apache 1.3 modules cannot be directly used - with Apache 2.0 - the module must be modified to dynamically - load or compile into Apache 2.0.

+

Modules built for one major version of the Apache HTTP Server + will generally not work on another. (e.g. 1.3 vs. 2.0, or 2.0 vs. + 2.2) There are usually API changes between one major version and + another that require that modules be modified to work with the new + version.

 @@ -54,7 +56,7 @@ Windows Note

The module name format changed for Windows - with Apache 1.3.15 and 2.0 - the modules are now named as + with Apache HTTP Server 1.3.15 and 2.0 - the modules are now named as mod_foo.so

While mod_so still loads modules with @@ -62,7 +64,7 @@ Windows preferred; if you are converting your loadable module for 2.0, please fix the name to this 2.0 convention.

 -

The Apache module API is unchanged between the Unix and +

The Apache httpd module API is unchanged between the Unix and Windows versions. Many modules will run on Windows with no or little change from Unix, although others rely on aspects of the Unix architecture which are not present in Windows, and will @@ -70,8 +72,8 @@ Windows

When a module does work, it can be added to the server in one of two ways. As with Unix, it can be compiled into the - server. Because Apache for Windows does not have the - Configure program of Apache for Unix, the module's + server. Because Apache httpd for Windows does not have the + Configure program of Apache httpd for Unix, the module's source file must be added to the ApacheCore project file, and its symbols must be added to the os\win32\modules.c file.

@@ -80,14 +82,14 @@ Windows library that can be loaded into the server at runtime, using the LoadModule directive. These module DLLs can be distributed and run on any - Apache for Windows installation, without recompilation of the + Apache httpd for Windows installation, without recompilation of the server.

To create a module DLL, a small change is necessary to the module's source file: The module record must be exported from the DLL (which will be created later; see below). To do this, add the AP_MODULE_DECLARE_DATA (defined in the - Apache header files) to your module's module record definition. + Apache httpd header files) to your module's module record definition. For example, if your module has:

@@ -108,7 +110,7 @@ Windows link this against the libhttpd.lib export library that is created when the libhttpd.dll shared library is compiled. You may also have to change the compiler settings to ensure that - the Apache header files are correctly located. You can find + the Apache httpd header files are correctly located. You can find this library in your server root's modules directory. It is best to grab an existing module .dsp file from the tree to assure the build environment is configured correctly, or