Author: brane
Date: Tue Jun 10 12:56:21 2025
New Revision: 1926336
URL: http://svn.apache.org/viewvc?rev=1926336&view=rev
Log:
On the user-defined-authn branch: Don't blacklist serf_authn_unregister_scheme
from the shared lib exports, just comment out the prototype instead.
* CMakeLists.txt
(EXPORTS_BLACKLIST): Remove serf_authn_unregister_scheme.
* serf.h
(serf_authn_unregister_scheme): Coumment out the prototype.
(SERF__AUTHN__HAVE_UNREGISTER): Remove.
* auth/auth.h
(SERF__AUTHN__HAVE_UNREGISTER): Remove.
* auth/auth.c
(serf_authn_unregister_scheme): Coumment out the prototype.
(SERF__AUTHN__HAVE_UNREGISTER): Remove.
* test/test_auth.c
(serf_authn_unregister_scheme): Make this a macro.
(SERF__AUTHN__HAVE_UNREGISTER): Remove.
Modified:
serf/branches/user-defined-authn/CMakeLists.txt
serf/branches/user-defined-authn/auth/auth.c
serf/branches/user-defined-authn/auth/auth.h
serf/branches/user-defined-authn/serf.h
serf/branches/user-defined-authn/test/test_auth.c
Modified: serf/branches/user-defined-authn/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/CMakeLists.txt?rev=1926336&r1=1926335&r2=1926336&view=diff
==============================================================================
--- serf/branches/user-defined-authn/CMakeLists.txt (original)
+++ serf/branches/user-defined-authn/CMakeLists.txt Tue Jun 10 12:56:21 2025
@@ -123,7 +123,6 @@ list(APPEND EXPORTS_BLACKLIST
"serf_http_protocol_create"
"serf_https_protocol_create"
"serf_http_request_queue"
- "serf_authn_unregister_scheme"
)
# Serf library source files
Modified: serf/branches/user-defined-authn/auth/auth.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/auth/auth.c?rev=1926336&r1=1926335&r2=1926336&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth.c (original)
+++ serf/branches/user-defined-authn/auth/auth.c Tue Jun 10 12:56:21 2025
@@ -704,11 +704,9 @@ apr_status_t serf_authn_register_scheme(
return status;
}
-#ifdef SERF__AUTHN__HAVE_UNREGISTER
-apr_status_t serf_authn_unregister_scheme(int type,
- const char *name,
- apr_pool_t *scratch_pool)
-#else
+/* apr_status_t serf_authn_unregister_scheme(int type, */
+/* const char *name, */
+/* apr_pool_t *scratch_pool) */
apr_status_t serf__authn__unregister_scheme(int type,
const char *name,
apr_pool_t *scratch_pool)
@@ -770,7 +768,6 @@ apr_status_t serf__authn__unregister_sch
return lock_status;
return status;
}
-#endif /* SERF__AUTHN__HAVE_UNREGISTER */
#if APR_HAS_THREADS
Modified: serf/branches/user-defined-authn/auth/auth.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/auth/auth.h?rev=1926336&r1=1926335&r2=1926336&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth.h (original)
+++ serf/branches/user-defined-authn/auth/auth.h Tue Jun 10 12:56:21 2025
@@ -151,12 +151,10 @@ extern const serf__authn_scheme_t serf__
/** User-defined authentication scheme handlers */
-#ifndef SERF__AUTHN__HAVE_UNREGISTER
-/* Declare the prototype for the internal unregister implementation */
+/* FIXME: Declare the prototype for the internal unregister implementation */
apr_status_t serf__authn__unregister_scheme(int type,
const char *name,
apr_pool_t *scratch_pool);
-#endif
apr_status_t
serf__authn_user__init_conn(const serf__authn_scheme_t *scheme,
Modified: serf/branches/user-defined-authn/serf.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf.h?rev=1926336&r1=1926335&r2=1926336&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf.h (original)
+++ serf/branches/user-defined-authn/serf.h Tue Jun 10 12:56:21 2025
@@ -981,7 +981,6 @@ apr_status_t serf_authn_register_scheme(
apr_pool_t *result_pool,
int *type);
-#ifdef SERF__AUTHN__HAVE_UNREGISTER
/* FIXME: Think some more about whether unregistering schemes makes sense. */
/**
* Unregister an uthentication scheme.
@@ -999,10 +998,9 @@ apr_status_t serf_authn_register_scheme(
*
* @since New in 1.4
*/
-apr_status_t serf_authn_unregister_scheme(int type,
- const char *name,
- apr_pool_t *scratch_pool);
-#endif /* SERF__AUTHN__HAVE_UNREGISTER */
+/* apr_status_t serf_authn_unregister_scheme(int type, */
+/* const char *name, */
+/* apr_pool_t *scratch_pool); */
/** @} */
Modified: serf/branches/user-defined-authn/test/test_auth.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/test_auth.c?rev=1926336&r1=1926335&r2=1926336&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/test_auth.c (original)
+++ serf/branches/user-defined-authn/test/test_auth.c Tue Jun 10 12:56:21 2025
@@ -512,17 +512,12 @@ static void test_auth_on_HEAD(CuTest *tc
}
-#ifndef SERF__AUTHN__HAVE_UNREGISTER
-/* FIXME: Temporary implementation of unregister function. */
+/* FIXME: Temporary rename of the unregister function. */
+#define serf_authn_unregister_scheme(type, name, scratch_pool) \
+ serf__authn__unregister_scheme((type), (name), (scratch_pool))
apr_status_t serf__authn__unregister_scheme(int type,
const char *name,
apr_pool_t *scratch_pool);
-static apr_status_t serf_authn_unregister_scheme(int type, const char *name,
- apr_pool_t *pool)
-{
- return serf__authn__unregister_scheme(type, name, pool);
-}
-#endif
static void test_authn_register_one(CuTest *tc)
{
@@ -537,7 +532,7 @@ static void test_authn_register_one(CuTe
CuAssertTrue(tc, type != SERF_AUTHN_NONE);
/* Unregister the scheme */
- status =serf_authn_unregister_scheme(type, "fiZzlE", tb->pool);
+ status = serf_authn_unregister_scheme(type, "fiZzlE", tb->pool);
CuAssertIntEquals(tc, APR_SUCCESS, status);
}
