Merge branch 'develop' of git://github.com/zendframework/zf2 into fea…

…ture/cache-session-storage Conflicts: CHANGELOG.md
zendframework · Nov 26, 2012 · db9d7ab · db9d7ab
commit db9d7ab
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Http.php b/src/Http.php
@@ -172,8 +172,8 @@ protected function parseUserInfo()
     public function getPort()
     {
         if (empty($this->port)) {
-            if (array_key_exists($this->scheme, self::$defaultPorts)) {
-                return self::$defaultPorts[$this->scheme];
+            if (array_key_exists($this->scheme, static::$defaultPorts)) {
+                return static::$defaultPorts[$this->scheme];
             }
         }
         return $this->port;