| commit | 7ef50153e6831d723e2e7aa62e37f01ceb848256 | [log] [tgz] |
|---|---|---|
| author | Stefan Sperling <stsp@apache.org> | Mon May 29 15:35:20 2023 +0000 |
| committer | Stefan Sperling <stsp@apache.org> | Mon May 29 15:35:20 2023 +0000 |
| tree | 55468def72d605598404dfb22a0f6d9d62f887d6 | |
| parent | a48dcf1c21b939f572017a9876c566c649a318f6 [diff] | |
| parent | ac14f3b1c72b2e5ebeebde9c7e7b01523ff0d075 [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-sslbuild@1910116 13f79535-47bb-0310-9956-ffa450edef68