Author: ivan
Date: Fri May 20 09:28:57 2011
New Revision: 1125292
URL: http://svn.apache.org/viewvc?rev=1125292&view=rev
Log:
Add DEFAULT_HTTP_LIBRARY define for configuring default HTTP library to use.
* configure.ac
(): Add DEFAULT_HTTP_LIBRARY define.
* notes/knobs
(Defaults): Document DEFAULT_HTTP_LIBRARY define.
* subversion/libsvn_ra/ra_loader.c
(svn_ra_open4): Use DEFAULT_HTTP_LIBRARY instead of hardcoded value.
* subversion/svn_private_config.hw
(DEFAULT_HTTP_LIBRARY): Add.
Modified:
subversion/trunk/configure.ac
subversion/trunk/notes/knobs
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/svn_private_config.hw
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1125292&r1=1125291&r2=1125292&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Fri May 20 09:28:57 2011
@@ -1232,6 +1232,10 @@ DEFAULT_FS_TYPE="fsfs"
AC_DEFINE_UNQUOTED(DEFAULT_FS_TYPE, "$DEFAULT_FS_TYPE",
[The fs type to use by default])
+DEFAULT_HTTP_LIBRARY="serf"
+AC_DEFINE_UNQUOTED(DEFAULT_HTTP_LIBRARY, "$DEFAULT_HTTP_LIBRARY",
+ [The http library to use by default])
+
# BSD/OS (BSDi) needs to use a different include syntax in Makefile
INCLUDE_OUTPUTS="include \$(top_srcdir)/build-outputs.mk"
case "$host" in
Modified: subversion/trunk/notes/knobs
URL:
http://svn.apache.org/viewvc/subversion/trunk/notes/knobs?rev=1125292&r1=1125291&r2=1125292&view=diff
==============================================================================
--- subversion/trunk/notes/knobs (original)
+++ subversion/trunk/notes/knobs Fri May 20 09:28:57 2011
@@ -28,6 +28,7 @@ API. Everything else is not officially s
2.1 Defaults
DEFAULT_FS_TYPE
+DEFAULT_HTTP_LIBRARY
MAX_SECS_TO_LINGER
SUFFIX_LINES_TO_KEEP
SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1125292&r1=1125291&r2=1125292&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Fri May 20 09:28:57 2011
@@ -286,7 +286,7 @@ svn_error_t *svn_ra_open4(svn_ra_session
apr_uri_t repos_URI;
apr_status_t apr_err;
#ifdef CHOOSABLE_DAV_MODULE
- const char *http_library = "serf";
+ const char *http_library = DEFAULT_HTTP_LIBRARY;
#endif
/* Auth caching parameters. */
svn_boolean_t store_passwords = SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS;
@@ -412,7 +412,7 @@ svn_error_t *svn_ra_open4(svn_ra_session
= svn_config_get_server_setting(servers,
server_group, /* NULL is OK */
SVN_CONFIG_OPTION_HTTP_LIBRARY,
- "serf");
+ DEFAULT_HTTP_LIBRARY);
if (strcmp(http_library, "neon") != 0 &&
strcmp(http_library, "serf") != 0)
Modified: subversion/trunk/subversion/svn_private_config.hw
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1125292&r1=1125291&r2=1125292&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Fri May 20 09:28:57 2011
@@ -58,6 +58,8 @@
/* The default FS back-end type */
#define DEFAULT_FS_TYPE "fsfs"
+/* The default HTTP library to use */
+#define DEFAULT_HTTP_LIBRARY "serf"
/* Define to the Python/C API format character suitable for apr_int64_t */
#if defined(_WIN64)
