From a761a838d586ef124c716b095caecb905b6c08ce Mon Sep 17 00:00:00 2001 From: Fathi Ben Nasr Date: Wed, 12 Aug 2026 13:10:40 +0000 Subject: [PATCH] HTTP: send associative extra headers correctly Both request drivers assume $extra_headers is a flat list of "Name: value" strings, but callers pass an associative array. The most visible case is the CardDAV provider, which sends array('Content-Type' => 'text/vcard; charset=utf-8') from RainLoop\Providers\AddressBook\CardDAV::davClientRequest(). curl: CURLOPT_HTTPHEADER receives the map as-is, so curl emits the bare value "text/vcard; charset=utf-8" as a header line and discards it as malformed. socket: array_merge() then implode("\r\n", ...) keeps only the values, producing the same malformed line. In both drivers the header is therefore lost, and because a body is present the request falls back to Content-Type: application/x-www-form-urlencoded. A CardDAV server is entitled to reject that: Cyrus IMAP answers PUT of a vCard with 403 so every contact upload fails while the download half of the sync works, which makes the sync look silently one-way. Normalise string keys to "Name: value" in both drivers and leave integer keys untouched, so existing callers that already pass a flat list are unaffected. --- .../0.0.0/app/libraries/snappymail/http/request/curl.php | 9 ++++++++- .../app/libraries/snappymail/http/request/socket.php | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php index f25fef1c0..31559d112 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php @@ -47,7 +47,14 @@ class CURL extends \SnappyMail\HTTP\Request \curl_setopt($c, CURLOPT_CAINFO, $this->ca_bundle); } if ($extra_headers) { - \curl_setopt($c, CURLOPT_HTTPHEADER, $extra_headers); + // CURLOPT_HTTPHEADER expects a flat list of "Name: value" strings. + // Callers may pass an associative array, in which case curl sends + // the bare values as malformed header lines and drops them. + $aHeaderLines = array(); + foreach ($extra_headers as $mKey => $sValue) { + $aHeaderLines[] = \is_int($mKey) ? $sValue : "{$mKey}: {$sValue}"; + } + \curl_setopt($c, CURLOPT_HTTPHEADER, $aHeaderLines); } if ($this->auth['user'] && $this->auth['type']) { if ($this->auth['type'] & self::AUTH_BEARER ) { diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php index 8b6ffc975..522bcd65a 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php @@ -43,7 +43,12 @@ class Socket extends \SnappyMail\HTTP\Request $extra_headers['Authorization'] = static::$Authorization[$host]; } if ($extra_headers) { - $headers = \array_merge($headers, $extra_headers); + // $headers is a flat list of "Name: value" strings, so an + // associative $extra_headers would lose its keys in the implode() + // below and emit bare values as malformed header lines. + foreach ($extra_headers as $mKey => $sValue) { + $headers[] = \is_int($mKey) ? $sValue : "{$mKey}: {$sValue}"; + } } $headers = \implode("\r\n", $headers); if (!\is_null($body)) {