Commit 79854ff3 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1747946 from trunk: 

mod_dav: Add dav_get_provider_name() function to obtain the name
of the provider from mod_dav.

Submitted by: minfrin
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1748215 13f79535-47bb-0310-9956-ffa450edef68
parent 82e4c4dd

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ 


Changes with Apache 2.4.21



  *) mod_dav: Add dav_get_provider_name() function to obtain the name

     of the provider from mod_dav.

     [Jari Urpalainen <jari.urpalainen nokia.com>]



  *) mod_proxy_fcgi: Avoid passing a filename of proxy:fcgi:// as

     SCRIPT_FILENAME to a FastCGI server. PR59618.

     [Jacob Champion <champion.pxi gmail.com>]



  *) mod_proxy_http2: properly care for HTTP2 flow control of the frontend

     connection is HTTP/1.1. [Patch supplied by Evgeny Kotkov]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -114,11 +114,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) mod_dav: Add dav_get_provider_name() function to obtain the name

     of the provider from mod_dav.

     trunk patch: http://svn.apache.org/r1747946

     2.4.x: trunk works modulo CHANGES/MMN

     +1: minfrin, jim, trawick



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ 
 * 20120211.59 (2.4.21-dev) Add ap_getword_conf2[_nc](),

 *                          ap_proxy_is_socket_connected() and

 *                          extended proxy_worker_shared.

 * 20120211.60 (2.4.21-dev) Add dav_get_provider_name.

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -482,7 +483,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20120211

#endif

#define MODULE_MAGIC_NUMBER_MINOR 59                   /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 60                   /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

modules/dav/main/mod_dav.c

+6 −0
Original line number Diff line number Diff line
@@ -201,6 +201,12 @@ static void *dav_merge_dir_config(apr_pool_t *p, void *base, void *overrides) 
    return newconf;

}



DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r)

{

    dav_dir_conf *conf = ap_get_module_config(r->per_dir_config, &dav_module);

    return conf ? conf->provider_name : NULL;

}



static const dav_provider *dav_get_provider(request_rec *r)

{

    dav_dir_conf *conf;

modules/dav/main/mod_dav.h

+1 −0
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ DAV_DECLARE(const dav_hooks_search *) dav_get_search_hooks(request_rec *r); 
DAV_DECLARE(void) dav_register_provider(apr_pool_t *p, const char *name,

                                        const dav_provider *hooks);

DAV_DECLARE(const dav_provider *) dav_lookup_provider(const char *name);

DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r);





/* ### deprecated */