Author: brane
Date: Thu Jun 19 02:47:36 2025
New Revision: 1926568
URL: http://svn.apache.org/viewvc?rev=1926568&view=rev
Log:
On the user-defined-authn branch: sync with trunk r1926566.
Modified:
serf/branches/user-defined-authn/ (props changed)
serf/branches/user-defined-authn/CMakeLists.txt
serf/branches/user-defined-authn/auth/auth_spnego.c
serf/branches/user-defined-authn/buckets/deflate_buckets.c
serf/branches/user-defined-authn/buckets/fcgi_buckets.c
serf/branches/user-defined-authn/buckets/ssl_buckets.c
serf/branches/user-defined-authn/serf.h
serf/branches/user-defined-authn/serf_private.h
Propchange: serf/branches/user-defined-authn/
------------------------------------------------------------------------------
Merged /serf/trunk:r1926487-1926566
Modified: serf/branches/user-defined-authn/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/CMakeLists.txt?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/CMakeLists.txt (original)
+++ serf/branches/user-defined-authn/CMakeLists.txt Thu Jun 19 02:47:36 2025
@@ -446,8 +446,8 @@ endif()
# Install targets
install(TARGETS ${SERF_TARGETS}
- ARCHIVE DESTINATION "${SERF_INSTALL_LIBS}"
- LIBRARY DESTINATION "${SERF_INSTALL_LIBS}"
+ ARCHIVE DESTINATION "${SERF_INSTALL_LIBRARIES}"
+ LIBRARY DESTINATION "${SERF_INSTALL_LIBRARIES}"
RUNTIME DESTINATION "${SERF_INSTALL_RUNTIME}")
install(FILES ${HEADERS} DESTINATION "${SERF_INSTALL_HEADERS}")
@@ -458,6 +458,7 @@ if(NOT SERF_WINDOWS)
function(make_pkgconfig)
set(PREFIX ${CMAKE_INSTALL_PREFIX})
set(INCLUDE_SUBDIR ${SERF_INCLUDE_SUBDIR})
+ set(LIBDIR \${prefix}/${SERF_INSTALL_LIBRARIES})
set(VERSION ${SERF_VERSION})
set(MAJOR ${SERF_MAJOR_VERSION})
set(SERF_INTERFACE_LIBS
Modified: serf/branches/user-defined-authn/auth/auth_spnego.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/auth/auth_spnego.c?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth_spnego.c (original)
+++ serf/branches/user-defined-authn/auth/auth_spnego.c Thu Jun 19 02:47:36 2025
@@ -99,7 +99,7 @@
typedef enum gss_api_auth_state {
gss_api_auth_not_started,
gss_api_auth_in_progress,
- gss_api_auth_completed,
+ gss_api_auth_completed
} gss_api_auth_state;
/**
@@ -159,7 +159,7 @@ typedef enum authn_persistence_state_t {
pstate_init,
pstate_undecided,
pstate_stateless,
- pstate_stateful,
+ pstate_stateful
} authn_persistence_state_t;
Modified: serf/branches/user-defined-authn/buckets/deflate_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/deflate_buckets.c?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/deflate_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/deflate_buckets.c Thu Jun 19
02:47:36 2025
@@ -56,7 +56,7 @@ typedef struct deflate_context_t {
/* When handling things the other way around */
STATE_WRITING_HEADER, /* produces a gzip header */
STATE_COMPRESS_INIT, /* initializes zlib for compression */
- STATE_COMPRESS_FINISH, /* clean up after producing body */
+ STATE_COMPRESS_FINISH /* clean up after producing body */
} state;
z_stream zstream;
Modified: serf/branches/user-defined-authn/buckets/fcgi_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/fcgi_buckets.c?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/fcgi_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/fcgi_buckets.c Thu Jun 19 02:47:36
2025
@@ -282,7 +282,7 @@ typedef struct fcgi_params_decode_ctx_t
{
DS_SIZES = 0,
DS_KEY,
- DS_VALUE,
+ DS_VALUE
} state;
char size_buffer[8];
@@ -906,4 +906,3 @@ const serf_bucket_type_t serf_bucket_typ
serf_fcgi_frame_get_remaining,
serf_fcgi_frame_set_config
};
-
Modified: serf/branches/user-defined-authn/buckets/ssl_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/ssl_buckets.c?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/ssl_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/ssl_buckets.c Thu Jun 19 02:47:36
2025
@@ -725,7 +725,7 @@ static int ocsp_callback(SSL *ssl, void
typedef enum san_copy_t {
EscapeNulAndCopy = 0,
- ErrorOnNul = 1,
+ ErrorOnNul = 1
} san_copy_t;
Modified: serf/branches/user-defined-authn/serf.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf.h?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf.h (original)
+++ serf/branches/user-defined-authn/serf.h Thu Jun 19 02:47:36 2025
@@ -1505,7 +1505,7 @@ typedef const apr_uint32_t serf_config_k
typedef enum serf_config_categories_t {
SERF_CONFIG_PER_CONTEXT = 0x10000000,
SERF_CONFIG_PER_HOST = 0x20000000,
- SERF_CONFIG_PER_CONNECTION = 0x40000000,
+ SERF_CONFIG_PER_CONNECTION = 0x40000000
} serf_config_categories_t;
#define SERF_CONFIG_HOST_NAME (SERF_CONFIG_PER_HOST | 0x000001)
Modified: serf/branches/user-defined-authn/serf_private.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf_private.h?rev=1926568&r1=1926567&r2=1926568&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf_private.h (original)
+++ serf/branches/user-defined-authn/serf_private.h Thu Jun 19 02:47:36 2025
@@ -232,7 +232,7 @@ typedef enum serf_request_writing_t {
SERF_WRITING_NONE, /* Nothing written */
SERF_WRITING_STARTED, /* Data in write bucket(s) */
SERF_WRITING_DONE, /* Everything written */
- SERF_WRITING_FINISHED, /* Safe to destroy */
+ SERF_WRITING_FINISHED /* Safe to destroy */
} serf_request_writing_t;
/* Holds all the information corresponding to a request/response pair. */
@@ -518,7 +518,7 @@ struct serf_incoming_t {
typedef enum {
SERF_CONN_INIT, /* no socket created yet */
SERF_CONN_SETUP_SSLTUNNEL, /* ssl tunnel being setup, no requests sent */
- SERF_CONN_CONNECTED, /* conn is ready to send requests */
+ SERF_CONN_CONNECTED /* conn is ready to send requests */
} serf__connection_state_t;
struct serf_connection_t {
