From 8de7f698a89fdff9dbd72cf1914c4bca37a35c7d Mon Sep 17 00:00:00 2001
From: jmunro <jmunro@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 18 Jun 2002 15:10:35 +0000
Subject: [PATCH] Update Changelog and add one more macosx workaround

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2964 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog             |  9 +++++++++
 functions/strings.php | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 460101b8..b42a8465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,15 @@ Version 1.3.0-DEVEL -- CVS
   
 Version 1.2.7 -- CVS
 --------------------
+  - fix for 'compose as new' link. bug #554886
+  - fix charset format in the admin plugin. bug #550725
+  - fix for errant '.' in default_folder_prefix. bug #551310
+  - fix for folder names with '?' and '*'. bug # 559257, #552180
+  - added the ability to search without the charset argument. #552288
+  - Made /noselect node display optional. bug #554988, patch #452178 
+  - Improved support for macosx IMAP server thanks Brian Haun
+  - Added macosx friendly search, thanks Brian Haun bug #553038
+  - Fixed word wrap problems when sending mail. bug #552961, #556143
   - Added possibility to use multiple compose windows without loss
     of attachements.
   - Fixed forward message/rfc822 attachments from a search 
diff --git a/functions/strings.php b/functions/strings.php
index 60e20393..df0a7117 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -153,7 +153,7 @@ function php_self () {
 function get_location () {
     
     global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT,
-        $HTTP_SERVER_VARS;
+        $HTTP_SERVER_VARS, $imap_server_type;
     
     /* Get the path, handle virtual directories */
     $path = substr(php_self(), 0, strrpos(php_self(), '/'));
@@ -196,6 +196,14 @@ function get_location () {
         }
     }
     
+   /* this is a workaround for the weird macosx caching that
+      causes Apache to return 16080 as the port number, which causes
+      SM to bail */
+      
+   if ($imap_server_type == 'macosx' && $port == ':16080') {
+        $port = '';
+   }
+   
     /* Fallback is to omit the server name and use a relative */
     /* URI, although this is not RFC 2616 compliant.          */
     return ($host ? $proto . $host . $port . $path : $path);
-- 
2.25.1