Changeset 31861 for main

Show
Ignore:
Timestamp:
09.08.2017 18:41:29 (2 years ago)
Author:
ak19
Message:

Correcting Https to https.

Location:
main/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/classes/dictionary.properties

    r31860 r31861  
    10001000Preferences.Connection.ProgramCommand:Preview Command: 
    10011001Preferences.Connection.ProgramCommand_Tooltip:The launch command for the program used to view the collection preview. Remember to use %1 as the placeholder for the collection address, and to use speechmarks where necessary. 
    1002 Preferences.Connection.No_Check_Certificate: No certificate checking for Https URLs # Disable Https security certificate checking? 
    1003 Preferences.Connection.No_Check_Certificate_Tooltip:Tick to download from Https URLs even if they don't have a (valid) security certificate. 
     1002Preferences.Connection.No_Check_Certificate: No certificate checking (effective on https URLs) # Disable https security certificate checking? 
     1003Preferences.Connection.No_Check_Certificate_Tooltip:Tick to download even from https URLs that don\'t have a (valid) security certificate. 
    10041004Preferences.Connection.Proxy_Host:Proxy Host: 
    10051005Preferences.Connection.Proxy_Host_Tooltip:The address of your proxy server 
  • main/trunk/gli/src/org/greenstone/gatherer/download/URLConnectionManager.java

    r31843 r31861  
    4141 
    4242 
    43 /** Use this class to get a URL connection with or without proxy settings, for Http or Https URLS, 
    44  * and with no-check-certificate on or off for Https URLs. 
    45  * This class has the ability to turn off checking security certificates for Https URLs to allow us to do  
     43/** Use this class to get a URL connection with or without proxy settings, for http or https URLS, 
     44 * and with no-check-certificate on or off for https URLs. 
     45 * This class has the ability to turn off checking security certificates for https URLs to allow us to do  
    4646 * the Java equivalent to running wget with --no-check-certificate. That part of the code is from 
    4747 * https://stackoverflow.com/questions/6659360/how-to-solve-javax-net-ssl-sslhandshakeexception-error 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

    r31860 r31861  
    7171    private JButton ok_button; 
    7272    private JCheckBox show_file_size_checkbox; 
    73     private JCheckBox no_check_certificate_checkbox; // Set no_check_certificate when retrieving Https URLs that have no (valid) certificate 
     73    private JCheckBox no_check_certificate_checkbox; // Set no_check_certificate when retrieving https URLs that have no (valid) certificate 
    7474    private JCheckBox use_proxy_checkbox; 
    7575    private JCheckBox view_extracted_metadata_checkbox; 
  • main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

    r31860 r31861  
    192192    my $strBaseCMD = $strOptions." --tries=2 -q -O - \"$self->{'url'}\""; 
    193193 
    194    
     194    #print STDOUT "\n@@@@ GETTING server_info with WGET CMD: $strBaseCMD\n\n"; 
     195     
    195196    my $strIdentifyText = $self->useWget($strBaseCMD); 
    196197     
     
    205206    } 
    206207     
    207     # with or without proxying set, getting server info may have failed if the URL was Https 
     208    # with or without proxying set, getting server info may have failed if the URL was https 
    208209    # but the site had no valid certificate and no_check_certificate wasn't turned on 
    209210    # suggest to the user to try turning it on 
  • main/trunk/greenstone2/perllib/strings.properties

    r31860 r31861  
    13381338WebDownload.proxied_connect_failed_info:Current proxy settings are:\n- host=%s\n- port=%s 
    13391339WebDownload.proxyless_connect_failed_info:- The external server might not be responding\n- or you might need to switch on proxy settings 
    1340 WebDownload.connect_failed_info:- or try ticking No Certificate Checking for Https\nin File > Preferences > Connection 
     1340WebDownload.connect_failed_info:- or try ticking No Certificate Checking (affects https URLs)\nin File > Preferences > Connection 
    13411341 
    13421342WgetDownload.desc: Base class that handles calls to wget