Changeset ce0596d


Ignore:
Timestamp:
Nov 25, 2013 9:11:56 PM (7 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
615ba94, c0ef19a
Parents:
35b6926
Message:

Reseed: Listen to "Require SSL" config option

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r35b6926 rce0596d  
     12013-11-25 str4d
     2 * Reseed: Listen to "Require SSL" config option
     3
    142013-11-23 zzz
    25 * i2ptunnel: Clean up old timer threads
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    r35b6926 rce0596d  
    256256            boolean defaulted = URLs == null;
    257257            boolean SSLDisable = _context.getBooleanProperty(PROP_SSL_DISABLE);
     258            boolean SSLRequired = _context.getBooleanProperty(PROP_SSL_REQUIRED);
    258259            if (defaulted) {
    259260                if (SSLDisable)
     
    266267                URLList.add(tok.nextToken().trim());
    267268            Collections.shuffle(URLList, _context.random());
    268             if (defaulted && !SSLDisable) {
     269            if (defaulted && !SSLDisable && !SSLRequired) {
    269270                // put the non-SSL at the end of the SSL
    270271                List<String> URLList2 = new ArrayList<String>();
Note: See TracChangeset for help on using the changeset viewer.