/[Apache-SVN]
ViewVC logotype

Revision 1910116

Jump to revision: Previous Next
Author: stsp
Date: Mon May 29 15:35:20 2023 UTC (11 months, 3 weeks ago)
Changed paths: 30
Log Message: 
On the 1.3.x-sslbuild branch: Merge from 1.3.x, resovling conflicts.

The only merge conflict was due to the introduction of the
bio_file_ctrl() function in buckets/ssl_buckets.c.

Changed paths

Path Details
Directoryserf/branches/1.3.x-sslbuild/ modified , props changed
Directoryserf/branches/1.3.x-sslbuild/.github/
(Copied from serf/branches/1.3.x/.github, r1910115) 		added
Directoryserf/branches/1.3.x-sslbuild/CHANGES modified , text changed
Directoryserf/branches/1.3.x-sslbuild/SConstruct modified , text changed
Directoryserf/branches/1.3.x-sslbuild/STATUS modified , text changed
Directoryserf/branches/1.3.x-sslbuild/buckets/dechunk_buckets.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/buckets/deflate_buckets.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/buckets/ssl_buckets.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/build/check.py modified , text changed
Directoryserf/branches/1.3.x-sslbuild/outgoing.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/serf.h modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/serf_bwtp.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/serf_get.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/serf_spider.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfcacert.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfclientcert.p12 modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfrootcacert.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfserver_expired_cert.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfserver_future_cert.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfservercert.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/serfserverkey.pem modified , text changed , props changed
Directoryserf/branches/1.3.x-sslbuild/test/server/test_server.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/server/test_server.h modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/server/test_sslserver.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_auth.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_buckets.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_context.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_serf.h modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_ssl.c modified , text changed
Directoryserf/branches/1.3.x-sslbuild/test/test_util.c modified , text changed
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26