Author: hartmannathan
Date: Thu Jun 5 02:19:04 2025
New Revision: 1926137
URL: http://svn.apache.org/viewvc?rev=1926137&view=rev
Log:
On the user-defined-authn branch: Sync with trunk r1926136.
Modified:
serf/branches/user-defined-authn/ (props changed)
serf/branches/user-defined-authn/.github/workflows/linux-cmake.yml
serf/branches/user-defined-authn/.github/workflows/linux.yml
serf/branches/user-defined-authn/.github/workflows/windows-cmake.yml
serf/branches/user-defined-authn/CHANGES
serf/branches/user-defined-authn/CMakeLists.txt
serf/branches/user-defined-authn/README
serf/branches/user-defined-authn/SConstruct
serf/branches/user-defined-authn/auth/auth.c
serf/branches/user-defined-authn/auth/auth_spnego.c
serf/branches/user-defined-authn/auth/auth_spnego_sspi.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/hpack_buckets.c
serf/branches/user-defined-authn/buckets/http2_frame_buckets.c
serf/branches/user-defined-authn/buckets/request_buckets.c
serf/branches/user-defined-authn/build/FindAPR.cmake
serf/branches/user-defined-authn/build/FindAPRUtil.cmake
serf/branches/user-defined-authn/build/FindBrotli.cmake
serf/branches/user-defined-authn/build/SerfMacOS.cmake
serf/branches/user-defined-authn/design-guide.txt
serf/branches/user-defined-authn/protocols/http2_stream.c
serf/branches/user-defined-authn/serf.h
serf/branches/user-defined-authn/serf_bucket_types.h
serf/branches/user-defined-authn/serf_bucket_util.h
serf/branches/user-defined-authn/serf_private.h
serf/branches/user-defined-authn/src/context.c
serf/branches/user-defined-authn/src/incoming.c
serf/branches/user-defined-authn/src/outgoing.c
serf/branches/user-defined-authn/src/pump.c
serf/branches/user-defined-authn/src/ssltunnel.c
serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.c
serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.h
serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP_server.c
serf/branches/user-defined-authn/test/test_context.c
serf/branches/user-defined-authn/test/test_internal.c
serf/branches/user-defined-authn/test/test_ssl.c
Propchange: serf/branches/user-defined-authn/
------------------------------------------------------------------------------
Merged /serf/trunk:r1926033-1926136
Modified: serf/branches/user-defined-authn/.github/workflows/linux-cmake.yml
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/.github/workflows/linux-cmake.yml?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/.github/workflows/linux-cmake.yml
(original)
+++ serf/branches/user-defined-authn/.github/workflows/linux-cmake.yml Thu Jun
5 02:19:04 2025
@@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
- os: [ "ubuntu-20.04", "ubuntu-22.04" ]
+ os: [ "ubuntu-22.04", "ubuntu-24.04" ]
build-type: [Debug, Release]
fail-fast: false
Modified: serf/branches/user-defined-authn/.github/workflows/linux.yml
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/.github/workflows/linux.yml?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/.github/workflows/linux.yml (original)
+++ serf/branches/user-defined-authn/.github/workflows/linux.yml Thu Jun 5
02:19:04 2025
@@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
- os: [ "ubuntu-20.04", "ubuntu-22.04" ]
+ os: [ "ubuntu-22.04", "ubuntu-24.04" ]
fail-fast: false
runs-on: ${{ matrix.os }}
Modified: serf/branches/user-defined-authn/.github/workflows/windows-cmake.yml
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/.github/workflows/windows-cmake.yml?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/.github/workflows/windows-cmake.yml
(original)
+++ serf/branches/user-defined-authn/.github/workflows/windows-cmake.yml Thu
Jun 5 02:19:04 2025
@@ -23,7 +23,7 @@ jobs:
runs-on: ${{ matrix.os }}
- env:
+ env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
@@ -35,12 +35,12 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN',
process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Install dependencies
- run: vcpkg install --triplet ${{ matrix.triplet }} apr apr-util zlib
openssl
+ run: vcpkg install --triplet ${{ matrix.triplet }} apr apr-util zlib
openssl brotli
- uses: actions/checkout@v3
- name: Configure CMake
- run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{
matrix.build-type }} -G "${{ matrix.generator }}"
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-DAPR_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
-DAPRUtil_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
+ run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{
matrix.build-type }} -G "${{ matrix.generator }}"
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-DAPR_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
-DAPRUtil_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
-DOPENSSL_ROOT_DIR=C:/vcpkg/installed/${{ matrix.triplet }}
-DZLIB_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
-DBrotli_ROOT=C:/vcpkg/installed/${{ matrix.triplet }}
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{
matrix.build-type }}
Modified: serf/branches/user-defined-authn/CHANGES
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/CHANGES?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/CHANGES (original)
+++ serf/branches/user-defined-authn/CHANGES Thu Jun 5 02:19:04 2025
@@ -2,7 +2,7 @@ Apache Serf 1.4.0 [2018-10-xx, from /tag
Features
--------
- Support for OCSP reqest generation and validation (r1830823)
+ Support for OCSP request generation and validation (r1830823)
Support for FCGI protocol (r1714736 et al.)
Support for HTTP/2 protocol (r1709274 et al.)
Add CRL support for OpenSSL (r1699867)
@@ -99,7 +99,7 @@ Apache Serf 1.3.9 [2016-09-01, from tags
Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r2441]
- Fix issue #152: CRC calculation error for gzipped http reponses > 4GB.
+ Fix issue #152: CRC calculation error for gzipped http responses > 4GB.
Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed.
Fix issue #154: Disable SSLv2 and SSLv3 as both or broken.
@@ -166,7 +166,7 @@ Serf 1.3.1 [2013-08-15, from /tags/1.3.1
Fix issue 112: add soname
Fix issue 113: add gssapi libs in the serf pc file
Fix issue 115: Setting RPATH on Solaris broken in SConstruct
- Fix issue 116: scons check should return non-zero exit staths
+ Fix issue 116: scons check should return non-zero exit status
Fix issue 121: make CFLAGS, LIBS, LINKFLAGS and CPPFLAGS take a space-
separated list of flags.
Fix issue 122: make scons PREFIX create the folder if it doesn't exist
@@ -317,7 +317,7 @@ Serf 0.4.0
Improvements and fixes to SSL support, including connection setup changes
Experimental support for unrequested, arriving ("async") responses
Experimental BWTP support using the async arrival feature
- Headers are combined on read (not write), to ease certian classes of parsing
+ Headers are combined on read (not write), to ease certain classes of parsing
Experimental feature on aggregate buckets for a callback-on-empty
Fix the bucket allocator for when APR is using its pool debugging features
Proxy support in the serf_get testing utility
Modified: serf/branches/user-defined-authn/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/CMakeLists.txt?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/CMakeLists.txt (original)
+++ serf/branches/user-defined-authn/CMakeLists.txt Thu Jun 5 02:19:04 2025
@@ -26,7 +26,7 @@
# APRUtil_ROOT - Path to APR-Util's install area
# OPENSSL_ROOT_DIR - Path to OpenSSL's install area
# ZLIB_ROOT - Path to zlib's install area
-# BROTLI_ROOT - Path to Brotli's install area
+# Brotli_ROOT - Path to Brotli's install area
# GSSAPI_ROOT - Path to GSSAPI's install area
# ===================================================================
@@ -54,11 +54,12 @@ option(APR_ROOT:PATH "Path to APR's inst
option(APRUtil_ROOT:PATH "Path to APR-Util's install area" "")
option(OPENSSL_ROOT_DIR:PATH "Path to OpenSSL's install area" "")
option(ZLIB_ROOT:PATH "Path to zlib's install area" "")
-option(BROTLI_ROOT:PATH "Path to Brotli's install area" "")
+option(Brotli_ROOT:PATH "Path to Brotli's install area" "")
option(GSSAPI_ROOT:PATH "Path to GSSAPI's install area" "")
# Build options
option(DEBUG "Enable debugging info and strict compile warnings" OFF)
+option(DOT_CLANGD "Generate a .clangd file at the root of the source tree" OFF)
option(SKIP_SHARED "Disable building shared Serf libraries" OFF)
option(SKIP_STATIC "Disable building static Serf libraries" OFF)
option(DISABLE_LOGGING "Disable the logging framework at compile time" OFF)
@@ -235,7 +236,7 @@ find_package(APR REQUIRED)
find_package(APRUtil REQUIRED)
# Find optional dependencies
-find_package(BROTLI)
+find_package(Brotli)
if(NOT SERF_WINDOWS)
find_package(GSSAPI)
else()
@@ -248,8 +249,8 @@ endif()
# Calculate the set of private and public targets
set(SERF_PRIVATE_TARGETS OpenSSL::Crypto OpenSSL::SSL ZLIB::ZLIB)
-if(BROTLI_FOUND)
- list(APPEND SERF_PRIVATE_TARGETS BROTLI::DECODE)
+if(Brotli_FOUND)
+ list(APPEND SERF_PRIVATE_TARGETS Brotli::Decode)
endif()
if(GSSAPI_FOUND)
add_compile_definitions("SERF_HAVE_GSSAPI")
@@ -289,12 +290,12 @@ CheckFunctionMacro("SSL_library_init" "S
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES}
${SERF_STANDARD_LIBRARIES})
CheckHeader("stdbool.h" "HAVE_STDBOOL_H=1")
CheckType("OSSL_HANDSHAKE_STATE" "openssl/ssl.h"
"SERF_HAVE_OSSL_HANDSHAKE_STATE" ${OPENSSL_INCLUDE_DIR})
-if(BROTLI_FOUND)
+if(Brotli_FOUND)
CheckType("BrotliDecoderResult" "brotli/decode.h"
"SERF_HAVE_BROTLI_DECODER_RESULT" ${BROTLI_INCLUDES})
# Check for the function only if the type check succeeded.
get_directory_property(_cdef COMPILE_DEFINITIONS)
if("SERF_HAVE_BROTLI_DECODER_RESULT" IN_LIST _cdef)
- CheckFunction("BrotliDecoderTakeOutput" "SERF_HAVE_BROTLI" BROTLI::DECODE
${SERF_STANDARD_LIBRARIES})
+ CheckFunction("BrotliDecoderTakeOutput" "SERF_HAVE_BROTLI" Brotli::Decode
${SERF_STANDARD_LIBRARIES})
endif()
endif()
@@ -406,7 +407,9 @@ set_target_properties(${SERF_TARGETS}
OUTPUT_NAME "serf-${SERF_MAJOR_VERSION}")
# Generate the .clangd file
-include(SerfGenClangd)
+if(DOT_CLANGD)
+ include(SerfGenClangd)
+endif()
# Install targets
install(TARGETS ${SERF_TARGETS}
@@ -464,6 +467,7 @@ endif()
set(_build_shared OFF)
set(_build_static OFF)
set(_build_tests OFF)
+set(_gen_dot_clangd OFF)
set(_have_brotli OFF)
set(_have_gssapi OFF)
set(_have_sspi OFF)
@@ -477,6 +481,9 @@ endif()
if(NOT SKIP_TESTS)
set(_build_tests ON)
endif()
+if(DOT_CLANGD)
+ set(_gen_dot_clangd ON)
+endif()
get_directory_property(_cdef COMPILE_DEFINITIONS)
if("SERF_HAVE_BROTLI" IN_LIST _cdef)
@@ -499,6 +506,7 @@ message(STATUS " build type .........
message(STATUS " shared libraries .... ... : ${_build_shared}")
message(STATUS " static libraries ........ : ${_build_static}")
message(STATUS " tests ................... : ${_build_tests}")
+message(STATUS " generate .clangd ........ : ${_gen_dot_clangd}")
message(STATUS " Options:")
message(STATUS " Brotli .................. : ${_have_brotli}")
message(STATUS " GSSAPI .................. : ${_have_gssapi}")
Modified: serf/branches/user-defined-authn/README
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/README?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/README (original)
+++ serf/branches/user-defined-authn/README Thu Jun 5 02:19:04 2025
@@ -80,7 +80,7 @@ specified on the install command line:
$ scons PREFIX=/some/path install
-Distribution package maintainers regulary install to a buildroot, and
+Distribution package maintainers regularly install to a buildroot, and
would normally use something like below in their build systems, with
placeholders for the specific paths:
Modified: serf/branches/user-defined-authn/SConstruct
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/SConstruct?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/SConstruct (original)
+++ serf/branches/user-defined-authn/SConstruct Thu Jun 5 02:19:04 2025
@@ -27,6 +27,21 @@ import re
EnsureSConsVersion(2,3,0)
+# SCons 4.7 introduced the argument list parameter to CheckFunc.
+# Of course, GetSConsVersion() was added in 4.8, it's more fun that way.
+have_check_func = False
+try:
+ if GetSConsVersion() >= (4, 7):
+ def CheckFunc(conf, name, code, lang='C', args=''):
+ return conf.CheckFunc(name, code, lang, args)
+ have_check_func = True
+except NameError:
+ pass
+if not have_check_func:
+ def CheckFunc(conf, name, code, lang='C', _=''):
+ return conf.CheckFunc(name, code, lang)
+
+
HEADER_FILES = ['serf.h',
'serf_bucket_types.h',
'serf_bucket_util.h',
@@ -464,7 +479,7 @@ else:
apu = os.path.join(apu, 'bin', 'apu-1-config')
env['APU'] = apu
- ### we should use --cc, but that is giving some scons error about an
implict
+ ### we should use --cc, but that is giving some scons error about an
implicit
### dependency upon gcc. probably ParseConfig doesn't know what to do with
### the apr-1-config output
env.ParseConfig('$APR --cflags --cppflags --ldflags --includes'
@@ -517,28 +532,29 @@ with io.StringIO(env.File('buckets/ssl_b
ssl_include_list.append(line.rstrip())
ssl_includes = '\n'.join(ssl_include_list)
+
conf = Configure(env)
-if not conf.CheckFunc('BIO_set_init', ssl_includes, 'C', 'NULL, 0'):
+if not CheckFunc(conf, 'BIO_set_init', ssl_includes, 'C', 'NULL, 0'):
env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
-if not conf.CheckFunc('X509_STORE_get0_param', ssl_includes, 'C', 'NULL'):
+if not CheckFunc(conf, 'X509_STORE_get0_param', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_NO_SSL_X509_STORE_WRAPPERS'])
-if not conf.CheckFunc('X509_get0_notBefore', ssl_includes, 'C', 'NULL'):
+if not CheckFunc(conf, 'X509_get0_notBefore', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_NO_SSL_X509_GET0_NOTBEFORE'])
-if not conf.CheckFunc('X509_get0_notAfter', ssl_includes, 'C', 'NULL'):
+if not CheckFunc(conf, 'X509_get0_notAfter', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_NO_SSL_X509_GET0_NOTAFTER'])
-if not conf.CheckFunc('X509_STORE_CTX_get0_chain', ssl_includes, 'C', 'NULL'):
+if not CheckFunc(conf, 'X509_STORE_CTX_get0_chain', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_NO_SSL_X509_GET0_CHAIN'])
-if not conf.CheckFunc('ASN1_STRING_get0_data', ssl_includes, 'C', 'NULL'):
+if not CheckFunc(conf, 'ASN1_STRING_get0_data', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_NO_SSL_ASN1_STRING_GET0_DATA'])
-if conf.CheckFunc('CRYPTO_set_locking_callback', ssl_includes, 'C', 'NULL'):
+if CheckFunc(conf, 'CRYPTO_set_locking_callback', ssl_includes, 'C', 'NULL'):
env.Append(CPPDEFINES=['SERF_HAVE_SSL_LOCKING_CALLBACKS'])
-if conf.CheckFunc('OPENSSL_malloc_init', ssl_includes):
+if CheckFunc(conf, 'OPENSSL_malloc_init', ssl_includes):
env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
-if conf.CheckFunc('SSL_library_init', ssl_includes):
+if CheckFunc(conf, 'SSL_library_init', ssl_includes):
env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_SSL_LIBRARY_INIT'])
-if conf.CheckFunc('OpenSSL_version_num', ssl_includes):
+if CheckFunc(conf, 'OpenSSL_version_num', ssl_includes):
env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_VERSION_NUM'])
-if conf.CheckFunc('SSL_set_alpn_protos', ssl_includes, 'C', 'NULL, NULL, 0'):
+if CheckFunc(conf, 'SSL_set_alpn_protos', ssl_includes, 'C', 'NULL, NULL, 0'):
env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_ALPN'])
if conf.CheckType('OSSL_HANDSHAKE_STATE', ssl_includes):
env.Append(CPPDEFINES=['SERF_HAVE_OSSL_HANDSHAKE_STATE'])
@@ -558,9 +574,9 @@ if sys.platform == 'win32':
if brotli and CALLOUT_OKAY:
conf = Configure(env)
if conf.CheckCHeader('brotli/decode.h') and \
- conf.CheckFunc('BrotliDecoderTakeOutput',
- '#include <brotli/decode.h>',
- 'C', 'NULL, NULL'):
+ CheckFunc(conf, 'BrotliDecoderTakeOutput',
+ '#include <brotli/decode.h>',
+ 'C', 'NULL, NULL'):
env.Append(CPPDEFINES=['SERF_HAVE_BROTLI'])
else:
print("Cannot find Brotli library >= 1.0.0 in '%s'." % env.get('BROTLI'))
Modified: serf/branches/user-defined-authn/auth/auth.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/auth/auth.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth.c (original)
+++ serf/branches/user-defined-authn/auth/auth.c Thu Jun 5 02:19:04 2025
@@ -428,7 +428,7 @@ apr_status_t serf__handle_auth_response(
if (resp_status) {
/* If there was an error in the final step of the authentication,
- consider the reponse body as invalid and discard it. */
+ consider the response body as invalid and discard it. */
status = discard_body(response);
*consumed_response = true;
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=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth_spnego.c (original)
+++ serf/branches/user-defined-authn/auth/auth_spnego.c Thu Jun 5 02:19:04 2025
@@ -117,7 +117,7 @@ typedef enum gss_api_auth_state {
To keep things simple, keep the connection in one by one mode.
(otherwise we'd have to keep a queue of gssapi context objects to match
the Negotiate header of the response with the session initiated by the
- mathing request).
+ matching request).
This state is an final state.
STATEFUL: alright, we have authenticated the connection and for the server
that is enough. Don't add an Authorization header to new requests.
Modified: serf/branches/user-defined-authn/auth/auth_spnego_sspi.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/auth/auth_spnego_sspi.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/auth/auth_spnego_sspi.c (original)
+++ serf/branches/user-defined-authn/auth/auth_spnego_sspi.c Thu Jun 5
02:19:04 2025
@@ -39,7 +39,7 @@ struct serf__spnego_context_t
{
CredHandle sspi_credentials;
CtxtHandle sspi_context;
- BOOL initalized;
+ BOOL initialized;
apr_pool_t *pool;
/* Service Principal Name (SPN) used for authentication. */
@@ -130,7 +130,7 @@ serf__spnego_create_sec_context(serf__sp
SecInvalidateHandle(&ctx->sspi_context);
SecInvalidateHandle(&ctx->sspi_credentials);
- ctx->initalized = FALSE;
+ ctx->initialized = FALSE;
ctx->pool = result_pool;
ctx->target_name = NULL;
ctx->authn_type = scheme->type;
@@ -192,7 +192,7 @@ serf__spnego_reset_sec_context(serf__spn
SecInvalidateHandle(&ctx->sspi_context);
}
- ctx->initalized = FALSE;
+ ctx->initialized = FALSE;
return APR_SUCCESS;
}
@@ -217,7 +217,7 @@ serf__spnego_init_sec_context(serf_conne
apr_status_t apr_status;
const char *canonname;
- if (!ctx->initalized && ctx->authn_type == SERF_AUTHN_NEGOTIATE) {
+ if (!ctx->initialized && ctx->authn_type == SERF_AUTHN_NEGOTIATE) {
apr_status = get_canonical_hostname(&canonname, hostname,
scratch_pool);
if (apr_status) {
return apr_status;
@@ -255,7 +255,7 @@ serf__spnego_init_sec_context(serf_conne
status = InitializeSecurityContextA(
&ctx->sspi_credentials,
- ctx->initalized ? &ctx->sspi_context : NULL,
+ ctx->initialized ? &ctx->sspi_context : NULL,
ctx->target_name,
ISC_REQ_ALLOCATE_MEMORY
| ISC_REQ_MUTUAL_AUTH,
@@ -274,7 +274,7 @@ serf__spnego_init_sec_context(serf_conne
apr_pool_cleanup_null);
}
- ctx->initalized = TRUE;
+ ctx->initialized = TRUE;
/* Finish authentication if SSPI requires so. */
if (status == SEC_I_COMPLETE_NEEDED
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=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/deflate_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/deflate_buckets.c Thu Jun 5
02:19:04 2025
@@ -261,7 +261,7 @@ static apr_status_t serf_deflate_refill(
if (APR_STATUS_IS_EOF(ctx->stream_status))
flush_v = Z_FINISH;
- /* Make valgrind happy and explictly initialize next_in to specific
+ /* Make valgrind happy and explicitly initialize next_in to specific
* value for empty buffer. */
if (private_len) {
ctx->zstream.next_in = (unsigned char*)private_data;
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=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/fcgi_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/fcgi_buckets.c Thu Jun 5 02:19:04
2025
@@ -132,7 +132,7 @@ apr_status_t serf__bucket_fcgi_unframe_r
else if (APR_STATUS_IS_EOF(status))
status = SERF_ERROR_TRUNCATED_STREAM;
- /* If we hava a zero-length frame we have to call the eof callback
+ /* If we have a zero-length frame we have to call the eof callback
now, as the read operations will just shortcut to APR_EOF */
if (ctx->payload_remaining == 0 && ctx->end_of_frame)
{
Modified: serf/branches/user-defined-authn/buckets/hpack_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/hpack_buckets.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/hpack_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/hpack_buckets.c Thu Jun 5
02:19:04 2025
@@ -300,7 +300,7 @@ struct serf_hpack_table_t
apr_size_t rl_sys_table_size;
};
-/* The staticly defined list of pre-encoded entries. All numbers above
+/* The statically defined list of pre-encoded entries. All numbers above
this list are dynamically defined, so some new standard is needed to
extend this list */
static const serf_hpack_entry_t hpack_static_table[] =
Modified: serf/branches/user-defined-authn/buckets/http2_frame_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/http2_frame_buckets.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/http2_frame_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/http2_frame_buckets.c Thu Jun 5
02:19:04 2025
@@ -173,7 +173,7 @@ serf__bucket_http2_unframe_read_info(ser
else if (APR_STATUS_IS_EOF(status))
status = SERF_ERROR_TRUNCATED_STREAM;
- /* If we hava a zero-length frame we have to call the eof callback
+ /* If we have a zero-length frame we have to call the eof callback
now, as the read operations will just shortcut to APR_EOF */
if (ctx->payload_remaining == 0 && ctx->end_of_frame) {
apr_status_t cb_status;
Modified: serf/branches/user-defined-authn/buckets/request_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/buckets/request_buckets.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/buckets/request_buckets.c (original)
+++ serf/branches/user-defined-authn/buckets/request_buckets.c Thu Jun 5
02:19:04 2025
@@ -201,7 +201,7 @@ static apr_status_t serf_request_read_io
static serf_bucket_t * serf_request_read_bucket(serf_bucket_t *bucket,
const serf_bucket_type_t *type)
{
- /* Luckily we don't have to be affraid for bucket_v2 tests here */
+ /* Luckily we don't have to be afraid for bucket_v2 tests here */
serialize_data(bucket);
return serf_bucket_read_bucket(bucket, type);
Modified: serf/branches/user-defined-authn/build/FindAPR.cmake
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/build/FindAPR.cmake?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/build/FindAPR.cmake (original)
+++ serf/branches/user-defined-authn/build/FindAPR.cmake Thu Jun 5 02:19:04
2025
@@ -72,7 +72,7 @@ function(_apru_config _program _varname
if(_apru_failed)
message(FATAL_ERROR "${_program} ${ARGN} failed")
else()
- # Join multi-line outupt
+ # Join multi-line output
string(REGEX REPLACE "[\r\n]" "" _apru_output "${_apru_output}")
# Optionally apply the regular expression filter
Modified: serf/branches/user-defined-authn/build/FindAPRUtil.cmake
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/build/FindAPRUtil.cmake?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/build/FindAPRUtil.cmake (original)
+++ serf/branches/user-defined-authn/build/FindAPRUtil.cmake Thu Jun 5
02:19:04 2025
@@ -127,7 +127,7 @@ else(APR_CONTAINS_APRUTIL)
" for APR-Util static linking.")
endif()
set(APRUTIL_STATIC_LIBS ${_apu_static} ${_apu_expat}
- CACHE STRING "APR-Util static libraies.")
+ CACHE STRING "APR-Util static libraries.")
else() # NOT Windows
Modified: serf/branches/user-defined-authn/build/FindBrotli.cmake
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/build/FindBrotli.cmake?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/build/FindBrotli.cmake (original)
+++ serf/branches/user-defined-authn/build/FindBrotli.cmake Thu Jun 5 02:19:04
2025
@@ -20,15 +20,15 @@
cmake_minimum_required(VERSION 3.12)
include(GNUInstallDirs)
-set(BROTLI_FOUND FALSE)
+set(Brotli_FOUND FALSE)
function(_get_brotli_version)
- if(DEFINED BROTLI_ROOT)
- get_filename_component(BROTLI_ROOT "${BROTLI_ROOT}" REALPATH)
+ if(DEFINED Brotli_ROOT)
+ get_filename_component(Brotli_ROOT "${Brotli_ROOT}" REALPATH)
find_program(brotli NAMES "brotli"
PATHS
- "${BROTLI_ROOT}/bin"
- "${BROTLI_ROOT}/${CMAKE_INSTALL_BINDIR}"
+ "${Brotli_ROOT}/bin"
+ "${Brotli_ROOT}/${CMAKE_INSTALL_BINDIR}"
NO_DEFAULT_PATH)
else()
find_program(brotli NAMES "brotli")
@@ -49,24 +49,24 @@ function(_get_brotli_version)
endfunction(_get_brotli_version)
function(_get_brotli_includes_libs)
- if(DEFINED BROTLI_ROOT)
+ if(DEFINED Brotli_ROOT)
find_path(includes "decode.h"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES
"include/brotli"
"${CMAKE_INSTALL_INCLUDEDIR}/brotli}"
NO_DEFAULT_PATH)
get_filename_component(includes "${includes}" DIRECTORY)
find_library(common_lib "brotlicommon"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
find_library(decode_lib "brotlidec"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
find_library(encode_lib "brotlienc"
- PATHS "${BROTLI_ROOT}"
+ PATHS "${Brotli_ROOT}"
PATH_SUFFIXES "lib" "${CMAKE_INSTALL_LIBDIR}"
NO_DEFAULT_PATH)
else()
@@ -93,28 +93,28 @@ if(NOT EXISTS "${BROTLI_INCLUDES}/brotli
message(STATUS "Could NOT find Brotli (missing headers)")
else()
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(BROTLI
+ find_package_handle_standard_args(Brotli
REQUIRED_VARS BROTLI_COMMON_LIBRARY
BROTLI_DECODE_LIBRARY
BROTLI_ENCODE_LIBRARY
BROTLI_INCLUDES
VERSION_VAR BROTLI_VERSION)
- if(BROTLI_FOUND)
- add_library(BROTLI::COMMON UNKNOWN IMPORTED)
- set_target_properties(BROTLI::COMMON PROPERTIES
+ if(Brotli_FOUND)
+ add_library(Brotli::Common UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Common PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
IMPORTED_LOCATION "${BROTLI_COMMON_LIBRARY}")
- add_library(BROTLI::DECODE UNKNOWN IMPORTED)
- set_target_properties(BROTLI::DECODE PROPERTIES
+ add_library(Brotli::Decode UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Decode PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
- INTERFACE_LINK_LIBRARIES BROTLI::COMMON
+ INTERFACE_LINK_LIBRARIES Brotli::Common
IMPORTED_LOCATION "${BROTLI_DECODE_LIBRARY}")
- add_library(BROTLI::ENCODE UNKNOWN IMPORTED)
- set_target_properties(BROTLI::ENCODE PROPERTIES
+ add_library(Brotli::Encode UNKNOWN IMPORTED)
+ set_target_properties(Brotli::Encode PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDES}"
- INTERFACE_LINK_LIBRARIES BROTLI::COMMON
+ INTERFACE_LINK_LIBRARIES Brotli::Common
IMPORTED_LOCATION "${BROTLI_ENCODE_LIBRARY}")
endif()
endif()
Modified: serf/branches/user-defined-authn/build/SerfMacOS.cmake
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/build/SerfMacOS.cmake?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/build/SerfMacOS.cmake (original)
+++ serf/branches/user-defined-authn/build/SerfMacOS.cmake Thu Jun 5 02:19:04
2025
@@ -50,7 +50,7 @@ function(serf_macos_find_packages)
# The user can always override that on the command line.
_serf_macos__find_package("zlib" ZLIB_ROOT "Path to zlib's install area")
endif()
- _serf_macos__find_package("brotli" BROTLI_ROOT "Path to Brotli's install
area")
+ _serf_macos__find_package("brotli" Brotli_ROOT "Path to Brotli's install
area")
_serf_macos__find_package("gssapi" GSSAPI_ROOT "Path to GSSAPI's install
area")
endfunction()
Modified: serf/branches/user-defined-authn/design-guide.txt
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/design-guide.txt?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/design-guide.txt (original)
+++ serf/branches/user-defined-authn/design-guide.txt Thu Jun 5 02:19:04 2025
@@ -45,7 +45,7 @@ objects to be used from multiple threads
For general information on the proper use of pools, please see:
- http://cvs.apache.org/viewcvs/*checkout*/apr/docs/pool-design.html
+ https://svn.apache.org/repos/asf/apr/apr/trunk/docs/pool-design.html
Within serf itself, the buckets introduce a significant issue related
to pools. Since it is very possible to end up creating *many* buckets
Modified: serf/branches/user-defined-authn/protocols/http2_stream.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/protocols/http2_stream.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/protocols/http2_stream.c (original)
+++ serf/branches/user-defined-authn/protocols/http2_stream.c Thu Jun 5
02:19:04 2025
@@ -118,7 +118,7 @@ static apr_status_t stream_send_headers(
/* And now schedule the packet for writing. Note that it is required
by the HTTP/2 spec to send HEADERS and CONTINUATION directly after
- each other, without other frames inbetween. */
+ each other, without other frames in between. */
while (hpack != NULL)
{
serf_bucket_t *next;
Modified: serf/branches/user-defined-authn/serf.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf.h?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf.h (original)
+++ serf/branches/user-defined-authn/serf.h Thu Jun 5 02:19:04 2025
@@ -601,7 +601,7 @@ apr_status_t serf_incoming_create(
* Creates a new client associated with @a ctx for socket @a insock. The client
* takes responsibility for @a client_pool and will destroy it after the
* connection is closed. Typically this would be the same pool as where the
- * incomming socket @a insock is allocated in.
+ * incoming socket @a insock is allocated in.
*
* This non-standard behavior is needed to support listeners inside the same
* @a ctx instance without leaking memory for each used connections. Callers
@@ -805,7 +805,7 @@ void serf_connection_request_prioritize(
/**
* Returns detected network latency for the @a conn connection. Negative
- * value means that latency is unknwon.
+ * value means that latency is unknown.
*/
apr_interval_time_t serf_connection_get_latency(serf_connection_t *conn);
@@ -1546,7 +1546,7 @@ typedef struct serf_log_layout_t serf_lo
* Create a stream output for log info. This can be used with one of the
* standard streams stderr or stdout.
* LAYOUT should be SERF_LOG_DEFAULT_LAYOUT (there's no alternative for now).
- * The lifetime of POOL should be atleast the same as that of CTX, but it can
+ * The lifetime of POOL should be at least the same as that of CTX, but it can
* be used by multiple contexts.
*
* @since New in 1.4.
@@ -1852,7 +1852,7 @@ void serf_debug__bucket_alloc_check(
* Values are returned in @a major, @a minor, and @a patch.
*
* Applications will want to use this function to verify compatibility,
- * expecially while serf has not reached a 1.0 milestone. APIs and
+ * especially while serf has not reached a 1.0 milestone. APIs and
* semantics may change drastically until the library hits 1.0.
*/
void serf_lib_version(
Modified: serf/branches/user-defined-authn/serf_bucket_types.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf_bucket_types.h?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf_bucket_types.h (original)
+++ serf/branches/user-defined-authn/serf_bucket_types.h Thu Jun 5 02:19:04
2025
@@ -671,7 +671,7 @@ typedef apr_status_t (*serf_ssl_protocol
*
* Returns APR_ENOTIMPL when the ssl library doesn't implement ALPN.
*
- * If successfull CALLBACK will be called as soon as the protocol is negotiated
+ * If successful CALLBACK will be called as soon as the protocol is negotiated
* or directly after the secured stream is connected.
*
* @since New in 1.4.
@@ -1042,14 +1042,14 @@ serf_bucket_t *serf_bucket_prefix_create
/**
* Creates two buckets, *HEAD and *TAIL, which together contain the output
* of STREAM. If there is enough data in STREAM, HEAD will be a bucket of at
- * least MIN_CHUNK_SIZE and will never be larget than MAX_CHUNK_SIZE.
+ * least MIN_CHUNK_SIZE and will never be larger than MAX_CHUNK_SIZE.
*
* If STREAM is at EOF before MIN_CHUNK_SIZE, HEAD will contain the data,
* while TAIL is immediately at EOF.
*
* HEAD and TAIL will make sure that data read from TAIL will not break the
* data availability promises on HEAD. Passing an existing tail of this
- * function as new stream may be handled specificaly, but the read promises
+ * function as new stream may be handled specifically, but the read promises
* on all nodes ahead of stream will still hold.
*
* HEAD and TAIL are allocated in STREAM->allocator. STREAM will be
Modified: serf/branches/user-defined-authn/serf_bucket_util.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf_bucket_util.h?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf_bucket_util.h (original)
+++ serf/branches/user-defined-authn/serf_bucket_util.h Thu Jun 5 02:19:04 2025
@@ -112,7 +112,7 @@ apr_status_t serf_default_peek(
/**
* Default implementation of the @see destroy functionality.
*
- * This function will return the @a bucket to its allcoator.
+ * This function will return the @a bucket to its allocator.
*/
void serf_default_destroy(
serf_bucket_t *bucket);
Modified: serf/branches/user-defined-authn/serf_private.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/serf_private.h?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/serf_private.h (original)
+++ serf/branches/user-defined-authn/serf_private.h Thu Jun 5 02:19:04 2025
@@ -514,7 +514,7 @@ struct serf_incoming_t {
serf_incoming_request_t *current_request; /* For HTTP/1 */
};
-/* States for the different stages in the lifecyle of a connection. */
+/* States for the different stages in the lifecycle of a connection. */
typedef enum {
SERF_CONN_INIT, /* no socket created yet */
SERF_CONN_SETUP_SSLTUNNEL, /* ssl tunnel being setup, no requests sent */
@@ -591,10 +591,10 @@ struct serf_connection_t {
only. */
int pipelining;
- /* Host url, path ommitted, syntax: https://svn.apache.org . */
+ /* Host url, path omitted, syntax: https://svn.apache.org . */
const char *host_url;
- /* Exploded host url, path ommitted. Only scheme, hostinfo, hostname &
+ /* Exploded host url, path omitted. Only scheme, hostinfo, hostname &
port values are filled in. */
apr_uri_t host_info;
@@ -717,11 +717,11 @@ apr_status_t serf__handle_auth_response(
when this is the first connection to the server.
TODO: The serf__authn_info_t objects are allocated in the context pool, so
a context that's used to connect to many different servers using Basic or
- Digest authencation will hold on to many objects indefinitely. We should be
+ Digest authentication will hold on to many objects indefinitely. We should
be
able to cleanup stale objects from time to time. */
serf__authn_info_t *serf__get_authn_info_for_server(serf_connection_t *conn);
-/* fromt context.c */
+/* from context.c */
void serf__context_progress_delta(void *progress_baton, apr_off_t read,
apr_off_t written);
Modified: serf/branches/user-defined-authn/src/context.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/src/context.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/src/context.c (original)
+++ serf/branches/user-defined-authn/src/context.c Thu Jun 5 02:19:04 2025
@@ -381,7 +381,7 @@ const char *serf_error_string(apr_status
case SERF_ERROR_EMPTY_STREAM:
return "The stream is empty";
case SERF_ERROR_EMPTY_READ:
- return "A successfull read of nothing occured";
+ return "A successful read of nothing occurred";
case SERF_ERROR_SSL_COMM_FAILED:
return "An error occurred during SSL communication";
Modified: serf/branches/user-defined-authn/src/incoming.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/src/incoming.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/src/incoming.c (original)
+++ serf/branches/user-defined-authn/src/incoming.c Thu Jun 5 02:19:04 2025
@@ -96,7 +96,7 @@ static apr_status_t response_finished(vo
return APR_SUCCESS;
}
-static apr_status_t http1_enqueue_reponse(serf_incoming_request_t *request,
+static apr_status_t http1_enqueue_response(serf_incoming_request_t *request,
void *enqueue_baton,
serf_bucket_t *bucket)
{
@@ -242,7 +242,7 @@ serf_incoming_request_t *serf__incoming_
apr_pool_create(&rq->pool, client->pool);
rq->incoming = client;
- rq->enqueue_response = http1_enqueue_reponse;
+ rq->enqueue_response = http1_enqueue_response;
rq->enqueue_baton = rq;
return rq;
@@ -716,14 +716,14 @@ apr_status_t serf__incoming_update_polls
if (!client->skt) {
int cid;
- /* We are in the proces of being cleaned up. As we are not
+ /* We are in the process of being cleaned up. As we are not
in the event loop and already notified the close callback
we can now clear our pool and remove us from the context */
if (client->config)
serf__config_store_remove_client(ctx->config_store, client);
- /* And from the incommings list */
+ /* And from the incomings list */
for (cid = 0; cid < ctx->incomings->nelts; cid++) {
if (GET_INCOMING(ctx, cid) == client) {
GET_INCOMING(ctx, cid) =
Modified: serf/branches/user-defined-authn/src/outgoing.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/src/outgoing.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/src/outgoing.c (original)
+++ serf/branches/user-defined-authn/src/outgoing.c Thu Jun 5 02:19:04 2025
@@ -93,7 +93,7 @@ request_pending(serf_request_t **next_re
/* Check if there is data waiting to be sent over the socket. This can happen
in two situations:
- - The connection queue has atleast one request with unwritten data.
+ - The connection queue has at least one request with unwritten data.
- All requests are written and the ssl layer wrote some data while reading
the response. This can happen when the server triggers a renegotiation,
e.g. after the first and only request on that connection was received.
Modified: serf/branches/user-defined-authn/src/pump.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/src/pump.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/src/pump.c (original)
+++ serf/branches/user-defined-authn/src/pump.c Thu Jun 5 02:19:04 2025
@@ -91,7 +91,7 @@ void serf_pump__done(serf_pump_t *pump)
pump->pool = NULL;
}
-/* Safely check if there is still data pending on the connection, carefull
+/* Safely check if there is still data pending on the connection, careful
to not accidentally make it invalid. */
bool serf_pump__data_pending(serf_pump_t *pump)
{
Modified: serf/branches/user-defined-authn/src/ssltunnel.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/src/ssltunnel.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/src/ssltunnel.c (original)
+++ serf/branches/user-defined-authn/src/ssltunnel.c Thu Jun 5 02:19:04 2025
@@ -27,7 +27,7 @@
#include "serf_private.h"
-/* Structure passed around as baton for the CONNECT request and respone. */
+/* Structure passed around as baton for the CONNECT request and response. */
typedef struct req_ctx_t {
apr_pool_t *pool;
const char *uri;
@@ -139,7 +139,7 @@ static apr_status_t handle_response(serf
val = serf_bucket_headers_get(hdrs, "Connection");
if (val && strcasecmp("close", val) == 0) {
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "Ignore Connection: close header on this reponse, don't "
+ "Ignore Connection: close header on this response, don't
"
"close the connection now that the tunnel is set up.\n");
serf__bucket_headers_remove(hdrs, "Connection");
}
Modified: serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.c (original)
+++ serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.c Thu Jun 5
02:19:04 2025
@@ -1100,7 +1100,7 @@ resp_set_repeat_pattern(const mhResponse
apr_pool_t *tmppool;
struct iovec *vecs;
- /* TODO: the whole reponse body should be converted to buckets so that
+ /* TODO: the whole response body should be converted to buckets so that
we can generate the body on the fly. */
apr_pool_create(&tmppool, resp->pool);
vecs = apr_pcalloc(tmppool, sizeof(struct iovec) * n);
Modified: serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.h
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.h?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.h (original)
+++ serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP.h Thu Jun 5
02:19:04 2025
@@ -590,7 +590,7 @@ apr_port_t mhServerByIDPortNr(const Mock
* Semi-public API *
* --------------- *
* These are the functions that are used by the public API macro's. *
- * While they're tecnically part of the API (they have to be because we use *
+ * While they're technically part of the API (they have to be because we use *
* macro's), we've made no effort to make them easy to use. *
******************************************************************************/
Modified: serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP_server.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP_server.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP_server.c
(original)
+++ serf/branches/user-defined-authn/test/MockHTTPinC/MockHTTP_server.c Thu Jun
5 02:19:04 2025
@@ -225,7 +225,7 @@ static apr_status_t setupTCPServer(mhSer
STATUSERR(apr_socket_opt_set(ctx->skt, APR_SO_NONBLOCK, 1));
STATUSERR(apr_socket_timeout_set(ctx->skt, 0));
/* We used to call apr_socket_opt_set(ctx->skt, APR_SO_REUSEADDR, 1),
- but that is severly broken when we run multiple tests in parallel,
+ but that is severely broken when we run multiple tests in parallel,
as that may just listen on a port where another process is
listening too.
@@ -249,7 +249,7 @@ static apr_status_t setupTCPServer(mhSer
break;
};
- /* Create a new pollset, avoid broken WSAPoll implemenation on Windows. */
+ /* Create a new pollset, avoid broken WSAPoll implementation on Windows. */
#ifdef BROKEN_WSAPOLL
STATUSERR(apr_pollset_create_ex(&ctx->pollset, 32, pool, 0,
APR_POLLSET_SELECT));
@@ -1030,7 +1030,7 @@ static char *respToString(apr_pool_t *po
(const char *)vec.iov_base);
}
} else {
- bool emptyChunk = NO; /* empty response should atleast have 0-chunk */
+ bool emptyChunk = NO; /* empty response should at least have 0-chunk */
for (i = 0 ; i < resp->chunks->nelts; i++) {
struct iovec vec;
@@ -1144,7 +1144,7 @@ void mhPushRequest(MockHTTP *mh, mhServC
* YES + *RESP + *ACTION if the request was matched successfully.
*/
-/* TOOD:
+/* TODO:
This function is the main bottleneck for performance. Possible fixes:
- if a test is setup to continuously add new request matchers while sending
requests, evaluation the matchers from last to first drastically
@@ -2559,7 +2559,7 @@ static apr_status_t status_from_ssl(sslC
/**
* Action: renegotiates a SSL session on client socket CCTX.
- * Returns APR_SUCCESS if the renegotiation handshake was successfull
+ * Returns APR_SUCCESS if the renegotiation handshake was successful
* error if not.
*/
static apr_status_t renegotiateSSLSession(_mhClientCtx_t *cctx)
Modified: serf/branches/user-defined-authn/test/test_context.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/test_context.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/test_context.c (original)
+++ serf/branches/user-defined-authn/test/test_context.c Thu Jun 5 02:19:04
2025
@@ -690,7 +690,7 @@ static void test_connection_userinfo_in_
}
/*****************************************************************************
- * Issue #91: test that serf correctly handle an incoming 4xx reponse while
+ * Issue #91: test that serf correctly handle an incoming 4xx response while
* the outgoing request wasn't written completely yet.
*****************************************************************************/
Modified: serf/branches/user-defined-authn/test/test_internal.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/test_internal.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/test_internal.c (original)
+++ serf/branches/user-defined-authn/test/test_internal.c Thu Jun 5 02:19:04
2025
@@ -329,7 +329,7 @@ static void test_header_buckets_remove(C
/* empty bucket, delete header */
serf__bucket_headers_remove(hdrs, "Content-Length");
- /* bucket with one header, delete a non-existant header */
+ /* bucket with one header, delete a non-existent header */
serf_bucket_headers_set(hdrs, "Content-Type", "text/plain");
serf__bucket_headers_remove(hdrs, "Content-Length");
cur = "Content-Type: text/plain" CRLF CRLF;
Modified: serf/branches/user-defined-authn/test/test_ssl.c
URL:
http://svn.apache.org/viewvc/serf/branches/user-defined-authn/test/test_ssl.c?rev=1926137&r1=1926136&r2=1926137&view=diff
==============================================================================
--- serf/branches/user-defined-authn/test/test_ssl.c (original)
+++ serf/branches/user-defined-authn/test/test_ssl.c Thu Jun 5 02:19:04 2025
@@ -2708,7 +2708,7 @@ static void test_ssl_ocsp_verify_respons
{
#ifndef OPENSSL_NO_OCSP
apr_status_t status = verify_ocsp_response(tc, 1, 0, 0, 0);
- /* OCSP responses MUST be signed, we can't even cteate one
+ /* OCSP responses MUST be signed, we can't even create one
without a signature. This error doesn't come from response
validation but because OCSP_response_create() fails. */
CuAssertIntEquals(tc, APR_EGENERAL, status);
