Changeset 36052


Ignore:
Timestamp:
Nov 3, 2015, 4:05:16 PM (5 years ago)
Author:
obi
Message:

fix merge

Location:
titan/plugins/tithek
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • titan/plugins/tithek/tithek.h

    r36051 r36052  
    718718        }
    719719
    720         amazon_init(titheklink, tithekfile);
     720//      amazon_init(titheklink, tithekfile);
    721721
    722722        delmarkedscreennodes(grid, 1);
  • titan/plugins/tithek/tithek_global.h

    r36051 r36052  
    5050        else if(ostrstr(tmplink, "thefile") != NULL)
    5151                streamurl = thefile(url);
    52         else if(ostrstr(tmplink, "youtube") != NULL)
     52        else if(ostrstr(tmplink, "youtu") != NULL)
    5353                streamurl = youtube(url);
    5454        else if(ostrstr(tmplink, "myvideo") != NULL)
     
    162162                        curl_easy_setopt(curl_handle, CURLOPT_HEADER, 1L);
    163163                curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 5);
    164                 curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 100);
     164                curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 20);
    165165                /* send all data to this function  */
    166166            if(localfile == NULL)
     
    182182                // CURLOPT_SSL_VERIFYPEER is disabled (it defaults to 2 - check the existence of a
    183183                // common name and also verify that it matches the hostname provided)
     184#ifdef MIPSEL
    184185                curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 1L);
     186#else
     187                curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);
     188#endif
    185189
    186190                curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0L);
Note: See TracChangeset for help on using the changeset viewer.