pike.git/ lib/ 7.8/ modules/ SSL.pmod/ sslfile.pike

2014-05-31

2014-05-31 19:18:52 by Martin Nilsson <nilsson@opera.com>

• 4ec35af1ebbf8b6ad116f8b5fd282d9d177e5d7c (37 lines) (+2/-35) ^{[ Show | Annotate ]}
  Branch: 8.0

Cleared out #if 0 from the attic.

223:      protected void thread_error (string msg, THREAD_T other_thread)   { - #if 0 && constant (_locate_references) -  werror ("%s\n%O got %d refs", msg, this, _refs (this)); -  _locate_references (this); - #endif +     error ("%s"    "%s\n"    "User callbacks: a=%O r=%O w=%O c=%O\n"
502:    read_buffer = String.Buffer();    real_backend = stream->query_backend();    close_state = STREAM_OPEN; - #if 0 -  // Unnecessary to init stuff to zero. -  callback_id = 0; -  local_backend = 0; -  close_packet_send_state = CLOSE_PACKET_NOT_SCHEDULED; -  local_errno = cb_errno = 0; -  got_extra_read_call_out = 0; -  alert_cb_called = 0; - #endif +        stream->set_read_callback (0);    stream->set_write_callback (0);
745:       write_buffer = ({});    - #if 0 -  accept_callback = 0; -  read_callback = 0; -  write_callback = 0; -  close_callback = 0; - #endif -  +     if (got_extra_read_call_out > 0)    real_backend->remove_call_out (ssl_read_callback);    got_extra_read_call_out = 0;
1092:    if (!zero_type(close))    close_callback = close;    - #if 0 -  if (!zero_type(read_oob)) -  read_oob_callback = read_oob; -  if (!zero_type (write_oob_cb)) -  write_oob_callback = write_oob; - #endif -  +     if (!zero_type(accept))    accept_callback = accept;   
2031:   #endif    written = stream->write (output);    -  if (written < 0 - #if 0 - #ifdef __NT__ -  // You don't want to know.. (Bug observed in Pike 0.6.132.) -  && stream->errno() != 1 - #endif - #endif -  ) { +  if (written < 0) {   #ifdef SIMULATE_CLOSE_PACKET_WRITE_FAILURE    if (close_packet_send_state == CLOSE_PACKET_QUEUED_OR_DONE)    cb_errno = System.EPIPE;