Commit 9aead7b1 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r689261 from trunk: 

Add option to insert something in autoindex head.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721731 13f79535-47bb-0310-9956-ffa450edef68
parent e24150a9

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.11



  *) mod_autoindex: add configuration option to insert string

     in HTML HEAD (IndexHeadInsert). [Nick Kew]



  *) Add new LogFormat parameter, %k, which logs the number of

     keepalive requests on this connection for this request.

     PR 45762 [Dan Poirier <poirier pobox.com>, Jim Jagielski]

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  * mod_autoindex: add option to insert a string into the HTML <HEAD>

    http://svn.apache.org/viewvc?view=rev&revision=689261

    +1: niq, rpluem, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

docs/manual/mod/mod_autoindex.xml

+20 −0
Changes for docs/manual/mod/mod_autoindex.xml: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -937,6 +937,26 @@ Name|Date|Size|Description</syntax> 
</usage>

</directivesynopsis>



<directivesynopsis>

<name>IndexHeadInsert</name>

<description>Inserts text in the HEAD section of an index page.</description>

<syntax>IndexHeadInsert <var>"markup ..."</var></syntax>

<contextlist><context>server config</context><context>virtual host</context>

<context>directory</context><context>.htaccess</context>

</contextlist>

<override>Indexes</override>



<usage>

    <p>The <directive>IndexHeadInsert</directive> directive specifies a

    string to insert in the <var>&lt;head&gt;</var> section of the HTML

    generated for the index page.</p>

    <example>

      <title>Example</title>

      IndexHeadInsert "&lt;link rel=\"sitemap\" href=\"/sitemap.html\"&gt;"

    </example>

</usage>

</directivesynopsis>



<directivesynopsis>

<name>ReadmeName</name>

<description>Name of the file that will be inserted at the end

modules/generators/mod_autoindex.c

+9 −0
Changes for modules/generators/mod_autoindex.c: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ typedef struct autoindex_config_struct { 


    char *default_icon;

    char *style_sheet;

    char *head_insert;

    apr_int32_t opts;

    apr_int32_t incremented_opts;

    apr_int32_t decremented_opts;
@@ -176,6 +177,9 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title) 
        ap_rvputs(r, "  <link rel=\"stylesheet\" href=\"", d->style_sheet,

                "\" type=\"text/css\"", xhtml ? " />\n" : ">\n", NULL);

    }

    if (d->head_insert != NULL) {

        ap_rputs(d->head_insert, r);

    }

    ap_rvputs(r, " </head>\n <body>\n", NULL);

}
@@ -594,6 +598,9 @@ static const command_rec autoindex_cmds[] = 
    AP_INIT_TAKE1("IndexStyleSheet", ap_set_string_slot,

                  (void *)APR_OFFSETOF(autoindex_config_rec, style_sheet),

                  DIR_CMD_PERMS, "URL to style sheet"),

    AP_INIT_TAKE1("IndexHeadInsert", ap_set_string_slot,

                  (void *)APR_OFFSETOF(autoindex_config_rec, head_insert),

                  DIR_CMD_PERMS, "String to insert in HTML HEAD section"),

    {NULL}

};
@@ -634,6 +641,8 @@ static void *merge_autoindex_configs(apr_pool_t *p, void *basev, void *addv) 
                                          : base->default_icon;

    new->style_sheet = add->style_sheet ? add->style_sheet

                                          : base->style_sheet;

    new->head_insert = add->head_insert ? add->head_insert

                                          : base->head_insert;

    new->icon_height = add->icon_height ? add->icon_height : base->icon_height;

    new->icon_width = add->icon_width ? add->icon_width : base->icon_width;