From: Paul Querna Date: Thu, 7 Apr 2005 02:04:03 +0000 (+0000) Subject: rename mod_imap to mod_imagemap. X-Git-Tag: 2.1.5~233 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a19987ca7f151b80c25e1fd6c24e938ca22987f4;p=apache rename mod_imap to mod_imagemap. Broken by this commit: - Win32 Build -- I didn't want to muck with .dsp files. - Netware Build - Same Story as Win32. - Documentation Translations (could get away with direct changes to the module name, but I am not sure) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160365 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 27a86a8003..f9603175b0 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.1.5 [Remove entries to the current 2.0 section below, when backported] + *) Rename mod_imap to mod_imagemap. + [Paul Querna] + *) util_ldap: Eliminate the load ordering of mod_ldap and mod_authnz_ldap by changing the mod_ldap exported functions to optional functions. [Brad Nicholes] diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en index 4bab347121..b2f347e4e9 100644 --- a/docs/manual/handler.html.en +++ b/docs/manual/handler.html.en @@ -34,7 +34,7 @@

What is a Handler

- +

A "handler" is an internal Apache representation of the @@ -68,7 +68,7 @@ script. (mod_cgi)

  • imap-file: Parse as an imagemap rule - file. (mod_imap)
  • + file. (mod_imagemap)
  • server-info: Get the server's configuration information. (mod_info)
  • diff --git a/docs/manual/handler.xml b/docs/manual/handler.xml index 4934b9baf7..d9302af3e4 100644 --- a/docs/manual/handler.xml +++ b/docs/manual/handler.xml @@ -35,7 +35,7 @@ mod_actions mod_asis mod_cgi - mod_imap + mod_imagemap mod_info mod_mime mod_negotiation @@ -83,7 +83,7 @@ script. (mod_cgi)
  • imap-file: Parse as an imagemap rule - file. (mod_imap)
  • + file. (mod_imagemap)
  • server-info: Get the server's configuration information. (mod_info)
  • diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en index 2875995771..ab8cb1863c 100644 --- a/docs/manual/misc/rewriteguide.html.en +++ b/docs/manual/misc/rewriteguide.html.en @@ -543,7 +543,7 @@ RewriteRule (.*) netsw-lsdir.cgi/$1 -

    NCSA imagemap to Apache mod_imap

    +

    NCSA imagemap to Apache mod_imagemap

    @@ -555,7 +555,7 @@ RewriteRule (.*) netsw-lsdir.cgi/$1 modern Apache webserver a lot of people want a smooth transition. So they want pages which use their old NCSA imagemap program to work under Apache with the - modern mod_imap. The problem is that there + modern mod_imagemap. The problem is that there are a lot of hyperlinks around which reference the imagemap program via /cgi-bin/imagemap/path/to/page.map. Under diff --git a/docs/manual/misc/rewriteguide.xml b/docs/manual/misc/rewriteguide.xml index c9f9fc98c6..170311439b 100644 --- a/docs/manual/misc/rewriteguide.xml +++ b/docs/manual/misc/rewriteguide.xml @@ -543,7 +543,7 @@ RewriteRule (.*) netsw-lsdir.cgi/$1
    - NCSA imagemap to Apache <code>mod_imap</code> + NCSA imagemap to Apache <code>mod_imagemap</code>
    Description:
    @@ -553,7 +553,7 @@ RewriteRule (.*) netsw-lsdir.cgi/$1 modern Apache webserver a lot of people want a smooth transition. So they want pages which use their old NCSA imagemap program to work under Apache with the - modern mod_imap. The problem is that there + modern mod_imagemap. The problem is that there are a lot of hyperlinks around which reference the imagemap program via /cgi-bin/imagemap/path/to/page.map. Under diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index a50db767ea..6742eaa740 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -40,7 +40,7 @@ mod_filter.xml mod_headers.xml mod_ident.xml - mod_imap.xml + mod_imagemap.xml mod_include.xml mod_info.xml mod_isapi.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 32fd220340..0ef2f06fb3 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -40,7 +40,7 @@ mod_filter.xml mod_headers.xml mod_ident.xml - mod_imap.xml + mod_imagemap.xml mod_include.xml mod_info.xml mod_isapi.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 2ee92861be..c4fe9a51ef 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -40,7 +40,7 @@ mod_filter.xml mod_headers.xml mod_ident.xml - mod_imap.xml + mod_imagemap.xml mod_include.xml mod_info.xml mod_isapi.xml diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 642e8f35d1..0d91020fb3 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -40,7 +40,7 @@ mod_filter.xml mod_headers.xml.ja mod_ident.xml - mod_imap.xml + mod_imagemap.xml mod_include.xml.ja mod_info.xml.ja mod_isapi.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 553544424e..3590070569 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -40,7 +40,7 @@ mod_filter.xml mod_headers.xml.ko mod_ident.xml.ko - mod_imap.xml.ko + mod_imagemap.xml.ko mod_include.xml mod_info.xml.ko mod_isapi.xml.ko diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index e7dc2c0d72..2905b45487 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -195,9 +195,9 @@
  • <IfDefine>
  • <IfModule>
  • <IfVersion>
  • -
  • ImapBase
  • -
  • ImapDefault
  • -
  • ImapMenu
  • +
  • ImapBase
  • +
  • ImapDefault
  • +
  • ImapMenu
  • Include
  • IndexIgnore
  • IndexOptions
  • diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index d4b43ee719..f1b7030487 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -127,7 +127,7 @@ delivery to the client
    mod_headers
    Customization of HTTP request and response headers
    mod_ident
    RFC 1413 ident lookups
    -
    mod_imap
    Server-side imagemap processing
    +
    mod_imagemap
    Server-side imagemap processing
    mod_include
    Server-parsed html documents (Server Side Includes)
    mod_info
    Provides a comprehensive overview of the server configuration
    diff --git a/docs/manual/mod/mod_authz_host.xml.ja b/docs/manual/mod/mod_authz_host.xml.ja index dcde34b201..c6393e8119 100644 --- a/docs/manual/mod/mod_authz_host.xml.ja +++ b/docs/manual/mod/mod_authz_host.xml.ja @@ -1,7 +1,7 @@ - + + -mod_imap - Apache HTTP Server +mod_imagemap - Apache HTTP Server @@ -19,15 +19,15 @@
    -

    Apache Module mod_imap

    +

    Apache Module mod_imagemap

    -

    Available Languages:  en  | - ko 

    +

    Available Languages:  en  | + ko 

    -
    Description:Server-side imagemap processing
    Status:Base
    Module Identifier:imap_module
    Source File:mod_imap.c
    +Source File:mod_imagemap.c

    Summary

    This module processes .map files, thereby @@ -294,7 +294,7 @@ Context:server config, virtual host, directory, .htaccess Override:Indexes Status:Base -Module:mod_imap +Module:mod_imagemap

    The ImapBase directive sets the default base used in the imagemap files. Its value is @@ -317,7 +317,7 @@ that are not explicitly mapped Context:server config, virtual host, directory, .htaccess Override:Indexes Status:Base -Module:mod_imap +Module:mod_imagemap

    The ImapDefault directive sets the default default used in the imagemap files. Its value is @@ -337,7 +337,7 @@ an imagemap Context:server config, virtual host, directory, .htaccess Override:Indexes Status:Base -Module:mod_imap +Module:mod_imagemap

    The ImapMenu directive determines the action taken if an imagemap file is called without valid @@ -374,8 +374,8 @@ an imagemap

    -

    Available Languages:  en  | - ko 

    +

    Available Languages:  en  | + ko 

    diff --git a/docs/manual/mod/mod_imap.xml b/docs/manual/mod/mod_imagemap.xml similarity index 97% rename from docs/manual/mod/mod_imap.xml rename to docs/manual/mod/mod_imagemap.xml index ab3d53d8f9..0aba85511c 100644 --- a/docs/manual/mod/mod_imap.xml +++ b/docs/manual/mod/mod_imagemap.xml @@ -20,12 +20,12 @@ limitations under the License. --> - + -mod_imap +mod_imagemap Server-side imagemap processing Base -mod_imap.c +mod_imagemap.c imap_module @@ -101,7 +101,7 @@

    Has the effect of <base href="value"> . The non-absolute URLs of the map-file are taken relative to this value. The base directive overrides - ImapBase as set in a + ImapBase as set in a .htaccess file or in the server configuration files. In the absence of an ImapBase configuration directive, base defaults to @@ -115,7 +115,7 @@ of the poly, circle or rect directives, and there are no point directives. Defaults to nocontent - in the absence of an ImapDefault configuration setting, causing a status code of 204 No Content to be returned. The client should keep the same page displayed.

    @@ -166,7 +166,7 @@
    Equivalent to the URL of the imagemap file itself. No coordinates are sent with this, so a menu will be generated - unless ImapMenu is set to + unless ImapMenu is set to none.
    menu
    diff --git a/docs/manual/mod/mod_imap.xml.ko b/docs/manual/mod/mod_imagemap.xml.ko similarity index 100% rename from docs/manual/mod/mod_imap.xml.ko rename to docs/manual/mod/mod_imagemap.xml.ko diff --git a/docs/manual/mod/mod_imap.xml.meta b/docs/manual/mod/mod_imagemap.xml.meta similarity index 84% rename from docs/manual/mod/mod_imap.xml.meta rename to docs/manual/mod/mod_imagemap.xml.meta index f432326a62..ee6b545f7c 100644 --- a/docs/manual/mod/mod_imap.xml.meta +++ b/docs/manual/mod/mod_imagemap.xml.meta @@ -1,7 +1,7 @@ - mod_imap + mod_imagemap /mod/ .. diff --git a/docs/manual/mod/mod_imap.html.ko.euc-kr b/docs/manual/mod/mod_imap.html.ko.euc-kr deleted file mode 100644 index e884582aca..0000000000 --- a/docs/manual/mod/mod_imap.html.ko.euc-kr +++ /dev/null @@ -1,361 +0,0 @@ - - - -mod_imap - Apache HTTP Server - - - - - - -
    <-
    - -
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_imap

    -
    -

    °¡´ÉÇÑ ¾ð¾î:  en  | - ko 

    -
    - - - -
    ¼³¸í:¼­¹öÃø À̹ÌÁö¸Ê(imagemap) ó¸®
    »óÅÂ:Base
    ¸ðµâ¸í:imap_module
    ¼Ò½ºÆÄÀÏ:mod_imap.c
    -

    ¿ä¾à

    - -

    ÀÌ ¸ðµâÀº imagemap CGI ÇÁ·Î±×·¥À» ´ë½ÅÇÏ¿© - .map ÆÄÀÏÀ» ó¸®ÇÑ´Ù. ÀÌ ¸ðµâÀº (AddHandler³ª SetHandler¸¦ »ç¿ëÇÏ¿©) - imap-file Çڵ鷯¸¦ »ç¿ëÇϵµ·Ï ¼³Á¤ÇÑ µð·ºÅ丮³ª - ¹®¼­¸¦ ó¸®ÇÑ´Ù.

    - -

    ¾Æ·¡ Áö½Ã¾î´Â .mapÀ¸·Î ³¡³ª´Â ÆÄÀÏÀ» À̹ÌÁö¸Ê - ÆÄÀÏ·Î ¼³Á¤ÇÑ´Ù.

    - -

    AddHandler imap-file map

    - -

    ¾ÆÁ÷µµ ¾Æ·¡¿Í °°Àº ¼³Á¤À» Áö¿øÇÑ´Ù.

    - -

    AddType application/x-httpd-imap map

    - -

    ±×·¯³ª ¿ì¸®´Â Á¡Â÷ "¼­¹ö¿¡°Ô Ưº°ÇÑ Àǹ̰¡ ÀÖ´Â MIME - type"À» Á¦°ÅÇÏ·Á°í Çϱ⶧¹®¿¡ ÀÌ ¹æ¹ýÀº ¾ø¾îÁú °ÍÀÌ´Ù.

    -
    - -
    top
    -
    -

    »õ·Î¿î ±â´É

    - -

    À̹ÌÁö¸Ê ¸ðµâ¿¡´Â ÀÌÀü À̹ÌÁö¸Ê ÇÁ·Î±×·¥¿¡´Â ¾ø´Â ¸î°¡Áö - »õ·Î¿î ±â´ÉÀÌ ÀÖ´Ù.

    - -
      -
    • Referer: Á¤º¸¿¡ »ó´ëÀûÀÎ URL ÂüÁ¶.
    • - -
    • »õ·Î¿î base ¸ÊÁö½Ã¾î¸¦ »ç¿ëÇÏ¿© ±âº» - <base> ÁöÁ¤.
    • - -
    • imagemap.conf ÆÄÀÏ ÇÊ¿ä¾øÀ½.
    • - -
    • Á¡(point) ÂüÁ¶.
    • - -
    • À̹ÌÁö¸Ê ¸Þ´º Á¶Á¤ °¡´É.
    • -
    -
    top
    -
    -

    À̹ÌÁö¸Ê ÆÄÀÏ

    - -

    À̹ÌÁö¸Ê ÆÄÀÏÀº ¾Æ·¡¿Í °°Àº Çü½ÄÀ¸·Î ÀÛ¼ºÇÑ´Ù.

    - -

    - directive value [x,y ...]
    - directive value "Menu text" [x,y - ...]
    - directive value x,y ... "Menu text" -

    - -

    directive´Â base, default, - poly, circle, rect, - point Áß Çϳª´Ù. value¿¡´Â Àý´ë URLÀ̳ª »ó´ë - URL ȤÀº ¾Æ·¡¿¡¼­ ¿­°ÅÇÒ Æ¯¼ö°ªÀ» »ç¿ëÇÑ´Ù. ÁÂÇ¥´Â °ø¹éÀ¸·Î - ±¸ºÐÇÑ x,y ½ÖÀÌ´Ù. µû¿ÈÇ¥·Î - ¹­Àº ¹®±¸´Â À̹ÌÁö¸Ê ¸Þ´º¸¦ ¸¸µé¶§ ¸µÅ© Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù. - '#'·Î ½ÃÀÛÇÏ´Â ÁÙÀº ÁÖ¼®ÀÌ´Ù.

    - -

    À̹ÌÁö¸Ê ÆÄÀÏ Áö½Ã¾î

    -

    À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ 6°¡Áö Áö½Ã¾î¸¦ »ç¿ëÇÒ ¼ö ÀÖ´Ù. Áö½Ã¾î´Â - Ưº°ÇÑ ¼ø¼­¾øÀÌ »ç¿ëÇÒ ¼ö ÀÖÁö¸¸, À̹ÌÁö¸Ê ÆÄÀÏ¿¡ ³ª¿Â - ¼ø¼­´ë·Î ó¸®ÇÑ´Ù.

    - -
    -
    base Áö½Ã¾î
    - -

    <base href="value"> - ±â´ÉÀ» ÇÑ´Ù. ¸ÊÆÄÀÏ¿¡¼­ ³ª¿À´Â URLÀº Àý´ë URLÀÌ ¾Æ´Ï¶ó¸é - ÀÌ °ª¿¡ »ó´ë URL·Î Ãë±ÞÇÑ´Ù. base Áö½Ã¾î´Â - .htaccess ÆÄÀÏÀ̳ª ¼­¹ö¼³Á¤ÆÄÀÏ¿¡¼­ ¼³Á¤ÇÑ - ImapBase °ªÀ» - ¹«½ÃÇÑ´Ù. ImapBase ¼³Á¤Áö½Ã¾î°¡ - ¾ø´Ù¸é ±âº» base °ªÀº - http://server_name/ÀÌ´Ù.

    -

    base_uri´Â base¿Í °°´Ù. URL¿¡¼­ - ¸¶Áö¸· ½½·¡½¬¸¦ ÀØÁö¸¶¶ó.

    - -
    default Áö½Ã¾î
    - -
    ÇØ´ç ÁÂÇ¥°¡ poly, circle, - rect Áö½Ã¾î¿¡ ÇØ´çÇÏÁö ¾Ê°í point - Áö½Ã¾î¸¦ »ç¿ëÇÏÁö ¾ÊÀº °æ¿ì ÇൿÀ» ÁöÁ¤ÇÑ´Ù. ImapDefault ¼³Á¤ÀÌ ¾ø´Ù¸é - ±âº»°ªÀº 204 No Content »óÅÂÄڵ带 ¹ÝȯÇÏ´Â - nocontentÀÌ´Ù. ÀÌ °æ¿ì Ŭ¶óÀÌ¾ðÆ®´Â µ¿ÀÏÇÑ - ÆäÀÌÁö¸¦ º¸¿©Áà¾ß ÇÑ´Ù.
    - -
    poly Áö½Ã¾î
    - -
    Á¡À» ¼¼°³¿¡¼­ ¹é°³±îÁö ÁöÁ¤ÇÒ ¼ö ÀÖ´Ù. »ç¿ëÀÚ°¡ ÀÌ - Á¡µé·Î ÀÌ·ç¾îÁø ´Ù°¢Çü ¾ÈÀÇ ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.
    - -
    circle
    - -
    ¿øÀÇ Á߽ɰú ¿øÀ§ÀÇ ÇÑ Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. »ç¿ëÀÚ°¡ - ¿ø ¾ÈÀÇ ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.
    - -
    rect Áö½Ã¾î
    - -
    »ç°¢ÇüÀÇ µÎ ¸ð¼­¸® Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. »ç°¢Çü ¾ÈÀÇ - ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì¿¡ »ç¿ëÇÑ´Ù.
    - -
    point Áö½Ã¾î
    - -
    ÇÑ Á¡ÀÇ ÁÂÇ¥¸¦ ¹Þ´Â´Ù. ´Ù¸¥ Áö½Ã¾îµéÀ» ¸¸Á·ÇÏÁö ¾ÊÀº - °æ¿ì »ç¿ëÀÚ°¡ ¼±ÅÃÇÑ ÁÂÇ¥¿¡ °¡Àå °¡±î¿î point Áö½Ã¾î¸¦ - »ç¿ëÇÑ´Ù. point Áö½Ã¾î¸¦ »ç¿ëÇϰí À¯È¿ÇÑ - ÁÂÇ¥¸¦ ¼±ÅÃÇÑ °æ¿ì default´Â Àý´ë·Î »ç¿ëµÇÁö - ¾Ê´Â´Ù.
    -
    - - -

    Áö½Ã¾î¿¡ »ç¿ëÇÒ ¼ö ÀÖ´Â °ªµé

    - -

    Áö½Ã¾î¿¡ ¾Æ·¡ value¸¦ »ç¿ëÇÒ ¼ö ÀÖ´Ù.

    - -
    -
    URL
    - -

    »ó´ë URLÀ̳ª Àý´ë URLÀ» »ç¿ëÇÒ ¼ö ÀÖ´Ù. »ó´ë URL¿¡ - '..'À» »ç¿ëÇÒ ¼ö ÀÖÀ¸¸ç, base °ªÀ» ±âÁØÀ¸·Î - ã´Â´Ù.

    -

    base¸¦ ¼³Á¤ÇÒ¶§´Â ÇöÀç base°ªÀº ¹«½ÃÇÑ´Ù. - ±×·¯³ª, base mailto: ¹®Àº »ç¿ëÇÒ ¼ö ÀÖ´Ù.

    - -
    map
    - -
    À̹ÌÁö¸Ê ÆÄÀÏ ÀÚü URL°ú °°´Ù. ÁÂÇ¥°¡ ¾ø°í ImapMenu°¡ noneÀÌ - ¾Æ´Ï¶ó¸é ¸Þ´º¸¦ ¸¸µç´Ù.
    - -
    menu
    -
    map°ú °°´Ù.
    - -
    referer
    - -
    ÂüÁ¶(¸µÅ©¸¦ µû¶ó¿À±â Àü) ¹®¼­ URL°ú °°´Ù. - Referer: Çì´õ°¡ ¾ø´Ù¸é ±âº»°ªÀº - http://servername/ÀÌ´Ù.
    - -
    nocontent
    - -
    Ŭ¶óÀÌ¾ðÆ®¿¡°Ô µ¿ÀÏÇÑ ÆäÀÌÁö¸¦ ±×´ë·Î º¸¿©ÁÖ¶ó´Â - 204 No Content »óÅÂÄڵ带 º¸³½´Ù. - base¸¦ Á¦¿ÜÇÑ ¸ðµç Áö½Ã¾î¿¡¼­ »ç¿ëÇÒ ¼ö ÀÖ´Ù.
    - -
    error
    - -
    ½ÇÆÐ¸¦ ³ªÅ¸³»´Â 500 Server Error¸¦ º¸³½´Ù. - base¸¦ Á¦¿ÜÇÑ ¸ðµç Áö½Ã¾î¿¡¼­ »ç¿ëÇÒ ¼ö ÀÖÁö¸¸, - default ¿Ü¿¡´Â »ç¿ëÇÒ ÀÏÀÌ ¾ø´Ù.
    -
    - - -

    ÁÂÇ¥

    - -
    -
    0,0 200,200
    - -
    ÁÂÇ¥´Â ½°Ç¥·Î ±¸ºÐÇÑ x¿Í y °ªÀÌ´Ù. - ÁÂÇ¥µéÀº ¼­·Î °ø¹éÀ¸·Î ±¸ºÐÇÑ´Ù. À̹ÌÁö¸ÊÀ» ´Ù·ç´Â ¹æ½Ä»ó - LynxÀÇ ÆíÀǸ¦ À§ÇØ »ç¿ëÀÚ°¡ 0,0 ÁÂÇ¥¸¦ ¼±ÅÃÇÏ¿´´Ù¸é - ÁÂÇ¥¸¦ ¼±ÅÃÇÏÁö ¾ÊÀº °Íó·³ µ¿ÀÛÇÑ´Ù.
    -
    - - - -

    µû¿ÈÇ¥·Î ¹­Àº ¹®±¸

    - -
    -
    "Menu Text"
    - -

    value µÚ³ª ÁÂÇ¥ µÚ¿¡ ½Öµû¿ÈÇ¥·Î ¹­Àº ¹®±¸¸¦ ÀûÀ» - ¼öµµ ÀÖ´Ù. ÀÌ ¹®ÀÚ¿­Àº ¸Þ´º¸¦ ¸¸µé¶§ ¸µÅ© Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù.

    - -

    - <a href="http://foo.com/">Menu text</a> -

    - -

    µû¿ÈÇ¥·Î ¹­Àº ¹®±¸°¡ ¾ø´Ù¸é ´ÙÀ½°ú °°ÀÌ ¸µÅ©¸¦ ¸µÅ© - Á¦¸ñÀ¸·Î »ç¿ëÇÑ´Ù.

    - -

    - <a href="http://foo.com/">http://foo.com</a> -

    - -

    ¹®±¸¿¡ ½Öµû¿ÈÇ¥¸¦ ¾²·Á¸é &quot;¿Í - °°ÀÌ Àû¾î¾ß ÇÑ´Ù.

    -
    - - -
    top
    -
    -

    ¸ÊÆÄÀÏ ¿¹Á¦

    - -

    - #'formatted'³ª 'semiformatted' ¸Þ´º´Â ÁÖ¼®À» Ãâ·ÂÇÑ´Ù.
    - #±×¸®°í ÁÖ¼®¿¡ html ű׸¦ ¾µ ¼ö ÀÖ´Ù. <hr>
    - base referer
    - poly map "¸Þ´º¸¦ º¸¿©ÁÖ¼¼¿ä." 0,0 0,10 10,10 10,0
    - rect .. 0,0 77,27 "ÂüÁ¶ ¹®¼­°¡ ÀÖ´Â µð·ºÅ丮"
    - circle http://www.inetnebr.com/lincoln/feedback/ 195,0 305,27
    - rect another_file "ÂüÁ¶ ¹®¼­¿Í °°Àº µð·ºÅ丮¿¡ ÀÖ´Â" 306,0 419,27
    - point http://www.zyzzyva.com/ 100,100
    - point http://www.tripod.com/ 200,200
    - rect mailto:nate@tripod.com 100,150 200,0 "¹ö±×?"
    -

    - -
    top
    -
    -

    ¸ÊÆÄÀÏ »ç¿ëÇϱâ

    - -

    HTML ¿¡Á¦

    - <a href="/maps/imagemap1.map">
    - - <img ismap src="/images/imagemap1.gif">
    -
    - </a> -

    - -

    XHTML ¿¹Á¦

    - <a href="/maps/imagemap1.map">
    - - <img ismap="ismap" src="/images/imagemap1.gif" />
    -
    - </a> -

    - -
    -
    top
    -

    ImapBase Áö½Ã¾î

    - - - - - - - - -
    ¼³¸í:À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ base ±âº»°ª
    ¹®¹ý:ImapBase map|referer|URL
    ±âº»°ª:ImapBase http://servername/
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:Indexes
    »óÅÂ:Base
    ¸ðµâ:mod_imap
    -

    ImapBase Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ - »ç¿ëÇÒ base ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏ - ¾È¿¡¼­ base Áö½Ã¾î¸¦ »ç¿ëÇÏ¸é ¿©±â¼­ ¼³Á¤ÇÑ - °ªÀº ¹«½ÃÇÑ´Ù. µÑ ¸ðµÎ ¾ø´Ù¸é, base ±âº»°ªÀº - http://servername/ÀÌ´Ù.

    - -

    Âü°í

    - -
    -
    top
    -

    ImapDefault Áö½Ã¾î

    - - - - - - - - -
    ¼³¸í:À̹ÌÁö¸Ê¿¡ ¾î´À ¿µ¿ª¿¡µµ ÇØ´çÇÏÁö ¾Ê´Â ÁÂÇ¥¸¦ ÁØ -°æ¿ì ±âº» Çൿ
    ¹®¹ý:ImapDefault error|nocontent|map|referer|URL
    ±âº»°ª:ImapDefault nocontent
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:Indexes
    »óÅÂ:Base
    ¸ðµâ:mod_imap
    -

    ImapDefault Áö½Ã¾î´Â À̹ÌÁö¸Ê - ÆÄÀÏ¿¡¼­ »ç¿ëÇÒ default ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù. - À̹ÌÁö¸Ê ÆÄÀÏ ¾È¿¡¼­ default Áö½Ã¾î¸¦ »ç¿ëÇϸé - ¿©±â¼­ ¼³Á¤ÇÑ °ªÀº ¹«½ÃÇÑ´Ù. µÑ ¸ðµÎ ¾ø´Ù¸é, default - ÇൿÀº Ŭ¶óÀÌ¾ðÆ®¿¡°Ô 204 No Content¸¦ º¸³»´Â - nocontentÀÌ´Ù. ÀÌ °æ¿ì Ŭ¶óÀÌ¾ðÆ®´Â ¿ø·¡ ÆäÀÌÁö¸¦ - ±×´ë·Î º¸¿©Áà¾ß ÇÑ´Ù.

    - -
    -
    top
    -

    ImapMenu Áö½Ã¾î

    - - - - - - - -
    ¼³¸í:ÁÂÇ¥¾øÀÌ À̹ÌÁö¸Ê ¿äû½Ã ÃëÇÒ Çൿ
    ¹®¹ý:ImapMenu none|formatted|semiformatted|unformatted
    »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess
    Override ¿É¼Ç:Indexes
    »óÅÂ:Base
    ¸ðµâ:mod_imap
    -

    ImapMenu Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡ - À¯È¿ÇÑ ÁÂÇ¥¸¦ ÁÖÁö ¾ÊÀº °æ¿ì ÃëÇÒ ÇൿÀ» °áÁ¤ÇÑ´Ù.

    - -
    -
    none
    -
    ImapMenu°¡ noneÀ̸é, ¸Þ´º¸¦ ¸¸µéÁö¾Ê°í - default ÇൿÀ» ÃëÇÑ´Ù.
    - -
    formatted
    -
    formatted ¸Þ´º´Â °¡Àå °£´ÜÇÑ ¸Þ´º´Ù. - À̹ÌÁö¸Ê ÆÄÀÏÀÇ ÁÖ¼®Àº ¹«½ÃÇÑ´Ù. °¡Àå Å« Ç¥Á¦¿Í ¼öÁ÷¼±À» - Ãâ·ÂÇϰí, ¸µÅ©¸¦ ÇÑÁÙ¾¿ Ãâ·ÂÇÑ´Ù. ¸Þ´º´Â ÀϰüµÇ°í ÆòÀÌÇϸç, - µð·ºÅ丮 ¸ñ·Ï°ú Èí»çÇÏ´Ù.
    - -
    semiformatted
    -
    semiformatted ¸Þ´º´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡ - ³ª¿À´Â ÁÖ¼®À» Ãâ·ÂÇÑ´Ù. ºóÁÙÀº HTML Çà¹Ù²ÞÀ¸·Î º¯È¯ÇÑ´Ù. - Ç¥Á¦³ª ¼öÁ÷¼±À» ±×¸®Áö ¾ÊÁö¸¸, ³ª¸ÓÁö´Â formatted - ¸Þ´º¿Í °°´Ù.
    - -
    unformatted
    -
    ÁÖ¼®Àº Ãâ·ÂÇϰí, ºóÁÙÀº ¹«½ÃÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏ¿¡ - ÀÖ´Â ³»¿ë¸¸ Ãâ·ÂÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏÀÇ ÁÖ¼®¿¡ ÇÊ¿äÇÑ ¸ðµç - Çà¹Ù²Þ°ú Ç¥Á¦¸¦ Àû¾î¾ß ÇÑ´Ù. ¸Þ´ºÀÇ ¿Ü°üÀ» °¡Àå ÀÚÀ¯ÀÚÁ¦·Î - ²Ù¹Ð ¼ö ÀÖÁö¸¸, À̹ÌÁö¸Ê ÆÄÀÏÀ» »ç½Ç»ó ÀÏ¹Ý ¹®ÀÚÆÄÀÏÀÌ - ¾Æ´Ñ HTML·Î ºÁ¾ß ÇÑ´Ù.
    -
    - -
    -
    -
    -

    °¡´ÉÇÑ ¾ð¾î:  en  | - ko 

    -
    - \ No newline at end of file diff --git a/docs/manual/mod/mod_info.xml.meta b/docs/manual/mod/mod_info.xml.meta index 65662859bc..6394d97498 100644 --- a/docs/manual/mod/mod_info.xml.meta +++ b/docs/manual/mod/mod_info.xml.meta @@ -7,7 +7,7 @@ en - ja + ja ko
    diff --git a/docs/manual/mod/mod_log_config.xml.meta b/docs/manual/mod/mod_log_config.xml.meta index f9817111e8..34d03d2b3e 100644 --- a/docs/manual/mod/mod_log_config.xml.meta +++ b/docs/manual/mod/mod_log_config.xml.meta @@ -7,7 +7,7 @@ en - ja + ja ko diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en index 13a0cc44be..00a963d067 100644 --- a/docs/manual/mod/mod_mime.html.en +++ b/docs/manual/mod/mod_mime.html.en @@ -135,12 +135,12 @@ usually result in the request being by the module associated with the handler. For example, if the .imap extension is mapped to the handler imap-file (from - mod_imap) and the .html extension is + mod_imagemap) and the .html extension is mapped to the MIME-type text/html, then the file world.imap.html will be associated with both the imap-file handler and text/html MIME-type. When it is processed, the imap-file handler will be used, - and so it will be treated as a mod_imap imagemap + and so it will be treated as a mod_imagemap imagemap file.

    top
    diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml index fb517d63ef..926e58ea3b 100644 --- a/docs/manual/mod/mod_mime.xml +++ b/docs/manual/mod/mod_mime.xml @@ -124,12 +124,12 @@ module="mod_mime_magic">MimeMagicFile usually result in the request being by the module associated with the handler. For example, if the .imap extension is mapped to the handler imap-file (from - mod_imap) and the .html extension is + mod_imagemap) and the .html extension is mapped to the MIME-type text/html, then the file world.imap.html will be associated with both the imap-file handler and text/html MIME-type. When it is processed, the imap-file handler will be used, - and so it will be treated as a mod_imap imagemap + and so it will be treated as a mod_imagemap imagemap file.

    diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index aee74719a1..adbf4ebe22 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -338,10 +338,10 @@ if a test is true at startup presence or absence of a specific module <IfVersion [[!]operator] version> ... </IfVersion>svdhEcontains version dependent configuration -ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files -ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates +ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files +ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates that are not explicitly mapped -ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling +ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling an imagemap Include file-path|directory-pathsvdCIncludes other configuration files from within the server configuration files diff --git a/docs/manual/mpm.xml.meta b/docs/manual/mpm.xml.meta index 03696010e1..ddd57d214b 100644 --- a/docs/manual/mpm.xml.meta +++ b/docs/manual/mpm.xml.meta @@ -9,7 +9,7 @@ de en es - ja + ja ko diff --git a/docs/manual/platform/ebcdic.html.en b/docs/manual/platform/ebcdic.html.en index 1a88167b2d..e2c2d8ce79 100644 --- a/docs/manual/platform/ebcdic.html.en +++ b/docs/manual/platform/ebcdic.html.en @@ -432,7 +432,7 @@ - mod_imap + mod_imagemap + diff --git a/docs/manual/platform/ebcdic.xml b/docs/manual/platform/ebcdic.xml index f91acb3af0..40aef0634b 100644 --- a/docs/manual/platform/ebcdic.xml +++ b/docs/manual/platform/ebcdic.xml @@ -429,7 +429,7 @@ - mod_imap + mod_imagemap + diff --git a/docs/manual/programs/configure.html.en b/docs/manual/programs/configure.html.en index 7c3a145152..6b5d9c9d2a 100644 --- a/docs/manual/programs/configure.html.en +++ b/docs/manual/programs/configure.html.en @@ -352,9 +352,9 @@
    Note: This module will always be linked statically. -
    --disable-imap
    +
    --disable-imagemap
    Disable support for server based imagemaps, which provided by - mod_imap.
    + mod_imagemap.
    --disable-include
    Disable Server Side Includes provided by diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml index 7bb20df233..4fbda1a72e 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -356,9 +356,9 @@
    Note: This module will always be linked statically.
    -
    --disable-imap
    +
    --disable-imagemap
    Disable support for server based imagemaps, which provided by - mod_imap.
    + mod_imagemap.
    --disable-include
    Disable Server Side Includes provided by diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en index b2e769b9a8..400cbe3fed 100644 --- a/docs/manual/sitemap.html.en +++ b/docs/manual/sitemap.html.en @@ -197,7 +197,7 @@ Server on HPUX
  • Apache Module mod_filter
  • Apache Module mod_headers
  • Apache Module mod_ident
  • -
  • Apache Module mod_imap
  • +
  • Apache Module mod_imagemap
  • Apache Module mod_include
  • Apache Module mod_info
  • Apache Module mod_isapi
  • diff --git a/docs/manual/sitemap.xml.meta b/docs/manual/sitemap.xml.meta index 4e2470686c..470f98c179 100644 --- a/docs/manual/sitemap.xml.meta +++ b/docs/manual/sitemap.xml.meta @@ -9,7 +9,7 @@ de en es - ja + ja ko diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 index f3d0e48dc0..49bcd680db 100644 --- a/modules/mappers/config9.m4 +++ b/modules/mappers/config9.m4 @@ -7,7 +7,7 @@ APACHE_MODPATH_INIT(mappers) APACHE_MODULE(vhost_alias, mass virtual hosting module, , , most) APACHE_MODULE(negotiation, content negotiation, , , yes) APACHE_MODULE(dir, directory request handling, , , yes) -APACHE_MODULE(imap, server-side imagemaps, , , most) +APACHE_MODULE(imagemap, server-side imagemaps, , , most) APACHE_MODULE(actions, Action triggering on requests, , , yes) APACHE_MODULE(speling, correct common URL misspellings, , , most) APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes) diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imagemap.c similarity index 99% rename from modules/mappers/mod_imap.c rename to modules/mappers/mod_imagemap.c index d5f2a955ad..eada55e440 100644 --- a/modules/mappers/mod_imap.c +++ b/modules/mappers/mod_imagemap.c @@ -83,7 +83,7 @@ double strtod(); /* SunOS needed this */ #endif -module AP_MODULE_DECLARE_DATA imap_module; +module AP_MODULE_DECLARE_DATA imagemap_module; typedef struct { char *imap_menu; @@ -593,7 +593,7 @@ static int imap_handler_internal(request_rec *r) ap_configfile_t *imap; - icr = ap_get_module_config(r->per_dir_config, &imap_module); + icr = ap_get_module_config(r->per_dir_config, &imagemap_module); imap_menu = icr->imap_menu ? icr->imap_menu : IMAP_MENU_DEFAULT; imap_default = icr->imap_default @@ -882,7 +882,7 @@ static void register_hooks(apr_pool_t *p) ap_hook_handler(imap_handler,NULL,NULL,APR_HOOK_MIDDLE); } -module AP_MODULE_DECLARE_DATA imap_module = +module AP_MODULE_DECLARE_DATA imagemap_module = { STANDARD20_MODULE_STUFF, create_imap_dir_config, /* dir config creater */ diff --git a/modules/mappers/mod_imap.dsp b/modules/mappers/mod_imagemap.dsp similarity index 97% rename from modules/mappers/mod_imap.dsp rename to modules/mappers/mod_imagemap.dsp index 492bf35bfb..fdc563902b 100644 --- a/modules/mappers/mod_imap.dsp +++ b/modules/mappers/mod_imagemap.dsp @@ -1,128 +1,128 @@ -# Microsoft Developer Studio Project File - Name="mod_imap" - 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_imap - 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_imap.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_imap.mak" CFG="mod_imap - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_imap - 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_imap - 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 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imap_src" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so /opt:ref - -!ELSEIF "$(CFG)" == "mod_imap - 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 "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imap_src" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /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 /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so - -!ENDIF - -# Begin Target - -# Name "mod_imap - Win32 Release" -# Name "mod_imap - Win32 Debug" -# Begin Source File - -SOURCE=.\mod_imap.c -# End Source File -# Begin Source File - -SOURCE=.\mod_imap.rc -# End Source File -# Begin Source File - -SOURCE=..\..\build\win32\win32ver.awk - -!IF "$(CFG)" == "mod_imap - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating Version Resource -InputPath=..\..\build\win32\win32ver.awk - -".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc - -# End Custom Build - -!ELSEIF "$(CFG)" == "mod_imap - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating Version Resource -InputPath=..\..\build\win32\win32ver.awk - -".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc - -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="mod_imap" - 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_imap - 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_imap.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_imap.mak" CFG="mod_imap - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_imap - 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_imap - 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 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imap_src" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so /opt:ref + +!ELSEIF "$(CFG)" == "mod_imap - 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 "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imap_src" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /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 /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so + +!ENDIF + +# Begin Target + +# Name "mod_imap - Win32 Release" +# Name "mod_imap - Win32 Debug" +# Begin Source File + +SOURCE=.\mod_imap.c +# End Source File +# Begin Source File + +SOURCE=.\mod_imap.rc +# End Source File +# Begin Source File + +SOURCE=..\..\build\win32\win32ver.awk + +!IF "$(CFG)" == "mod_imap - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating Version Resource +InputPath=..\..\build\win32\win32ver.awk + +".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc + +# End Custom Build + +!ELSEIF "$(CFG)" == "mod_imap - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating Version Resource +InputPath=..\..\build\win32\win32ver.awk + +".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc + +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project diff --git a/modules/mappers/mod_imap.exp b/modules/mappers/mod_imagemap.exp similarity index 100% rename from modules/mappers/mod_imap.exp rename to modules/mappers/mod_imagemap.exp