Roxen.git/ server/ base_server/ roxen.pike

2016-03-04

2016-03-04 09:53:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 9124fe81a11fb763272f0c486eb2f740c86067ba (11 lines) (+7/-4) ^{[ Show | Annotate ]}
  Branch: 99a7d84405b2bc1c8bd936eccd2a29795496c738

SSL: Restore the port options before using them.

Fixes some SSL options not having the intended effect at server start.

Fixes main part of [bug 7657 (#7657)].

1537:      mapping get_port_options( string key )   //! Get the options for the key 'key'. - //! The intepretation of the options is protocol specific. + //! The interpretation of the options is protocol specific.   {    return (query( "port_options" )[ key ] || ([]));   }      void set_port_options( string key, mapping value )   //! Set the options for the key 'key'. - //! The intepretation of the options is protocol specific. + //! The interpretation of the options is protocol specific.   {    mapping q = query("port_options");    q[ key ] = value;
2594:       set_up_ssl_variables( this_object() );    +  // NB: setup() calls restore() which initializes the variables +  // created above. +  ::setup(pn, i); +    #if constant(SSL.Constants.PROTOCOL_TLS_MAX)    set_version();   #endif       filter_preferred_suites();    -  ::setup(pn, i); -  +     certificates_changed (0, ignore_eaddrinuse);       // Install the change callbacks here to avoid duplicate calls