From 09d874791424fe0e10495edfb834a83ee4edac5c Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 6 Jan 2013 21:38:40 +0100
Subject: [PATCH] Specify port in the connection string instead of adding a
 protected property

---
 src/Monolog/Handler/PushoverHandler.php | 3 +--
 src/Monolog/Handler/SocketHandler.php   | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Monolog/Handler/PushoverHandler.php b/src/Monolog/Handler/PushoverHandler.php
index 8a87288e..03595183 100644
--- a/src/Monolog/Handler/PushoverHandler.php
+++ b/src/Monolog/Handler/PushoverHandler.php
@@ -34,8 +34,7 @@ class PushoverHandler extends SocketHandler
      */
     public function __construct($token, $user, $title = 'Monolog', $level = Logger::CRITICAL, $bubble = true)
     {
-        parent::__construct('api.pushover.net', $level, $bubble);
-        $this->connectionPort = 80;
+        parent::__construct('api.pushover.net:80', $level, $bubble);
 
         $this->token = $token;
         $this->user = $user;
diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php
index fbbf1131..4faa327d 100644
--- a/src/Monolog/Handler/SocketHandler.php
+++ b/src/Monolog/Handler/SocketHandler.php
@@ -22,7 +22,6 @@ use Monolog\Logger;
 class SocketHandler extends AbstractProcessingHandler
 {
     private $connectionString;
-    protected $connectionPort = -1;
     private $connectionTimeout;
     private $resource;
     private $timeout = 0;
@@ -172,7 +171,7 @@ class SocketHandler extends AbstractProcessingHandler
      */
     protected function pfsockopen()
     {
-        return @pfsockopen($this->connectionString, $this->connectionPort, $this->errno, $this->errstr, $this->connectionTimeout);
+        return @pfsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
     }
 
     /**
@@ -180,7 +179,7 @@ class SocketHandler extends AbstractProcessingHandler
      */
     protected function fsockopen()
     {
-        return @fsockopen($this->connectionString, $this->connectionPort, $this->errno, $this->errstr, $this->connectionTimeout);
+        return @fsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
     }
 
     /**
@@ -259,7 +258,7 @@ class SocketHandler extends AbstractProcessingHandler
         }
     }
 
-    protected function writeToSocket($data)
+    private function writeToSocket($data)
     {
         $length = strlen($data);
         $sent = 0;