From d8a3548a110cdec6b83671bafb787462a44e882b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 12 Dec 2012 09:11:20 +0200
Subject: [PATCH] yesod-default parses DISPLAY_PORT (#459)

---
 yesod-default/Yesod/Default/Config.hs | 12 +++++++++++-
 yesod-default/yesod-default.cabal     |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 62220645..5519bfdc 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -181,7 +181,17 @@ loadConfig (ConfigSettings env parseExtra getFile getObject) = do
 
     let host    = fromString $ T.unpack $ fromMaybe "*" $ lookupScalar "host"    m
     mport <- parseMonad (\x -> x .: "port") m
-    let approot = fromMaybe "" $ lookupScalar "approot" m
+    let approot' = fromMaybe "" $ lookupScalar "approot" m
+
+    -- Handle the DISPLAY_PORT environment variable for yesod devel
+    approot <-
+        case T.stripSuffix ":3000" approot' of
+            Nothing -> return approot'
+            Just prefix -> do
+                envVars <- getEnvironment
+                case lookup "DISPLAY_PORT" envVars of
+                    Nothing -> return approot'
+                    Just p -> return $ prefix `T.append` T.pack (':' : p)
 
     extra <- parseMonad (parseExtra env) m
 
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index f79b990e..013db642 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -1,5 +1,5 @@
 name:            yesod-default
-version:         1.1.2
+version:         1.1.3
 license:         MIT
 license-file:    LICENSE
 author:          Patrick Brisbin