Revision f2e13d55

b/lib/http/client.py
264 264
    # keep-alive settings, see "man 7 tcp" for TCP_KEEPCNT, TCP_KEEPIDLE and
265 265
    # TCP_KEEPINTVL.
266 266

  
267
    # Do the secret SSL handshake
268
    if self.using_ssl:
269
      self.sock.set_connect_state()
270
      try:
271
        http.Handshake(self.poller, self.sock, self.WRITE_TIMEOUT)
272
      except http.HttpSessionHandshakeUnexpectedEOF:
273
        raise http.HttpError("Server closed connection during SSL handshake")
274

  
267 275
  def _SendRequest(self):
268 276
    """Sends request to server.
269 277

  
b/lib/http/server.py
252 252
      request_msg_reader = None
253 253
      force_close = True
254 254
      try:
255
        # Do the secret SSL handshake
256
        if self.server.using_ssl:
257
          self.sock.set_accept_state()
258
          try:
259
            http.Handshake(self.poller, self.sock, self.WRITE_TIMEOUT)
260
          except http.HttpSessionHandshakeUnexpectedEOF:
261
            # Ignore rest
262
            return
263

  
255 264
        try:
256 265
          try:
257 266
            request_msg_reader = self._ReadRequest()

Also available in: Unified diff