mirror of https://github.com/searxng/searxng.git
Merge branch 'master' into languages
This commit is contained in:
commit
7fba3d1179
|
@ -34,11 +34,6 @@ def request(query, params):
|
||||||
params['url'] = search_url.format(query=urlencode({'q': query}),
|
params['url'] = search_url.format(query=urlencode({'q': query}),
|
||||||
pageno=params['pageno'] - 1)
|
pageno=params['pageno'] - 1)
|
||||||
|
|
||||||
# Disable SSL verification
|
|
||||||
# error: (60) SSL certificate problem: unable to get local issuer
|
|
||||||
# certificate
|
|
||||||
params['verify'] = False
|
|
||||||
|
|
||||||
return params
|
return params
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,11 +27,6 @@ def request(query, params):
|
||||||
params['url'] = search_url.format(query=urlencode({'q': query}),
|
params['url'] = search_url.format(query=urlencode({'q': query}),
|
||||||
pageno=params['pageno'] - 1)
|
pageno=params['pageno'] - 1)
|
||||||
|
|
||||||
# Disable SSL verification
|
|
||||||
# error: (60) SSL certificate problem: unable to get local issuer
|
|
||||||
# certificate
|
|
||||||
params['verify'] = False
|
|
||||||
|
|
||||||
return params
|
return params
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -262,7 +262,7 @@ def get_search_query_from_webapp(preferences, form):
|
||||||
if not load_default_categories:
|
if not load_default_categories:
|
||||||
if not query_categories:
|
if not query_categories:
|
||||||
query_categories = list(set(engine['category']
|
query_categories = list(set(engine['category']
|
||||||
for engine in engines))
|
for engine in query_engines))
|
||||||
else:
|
else:
|
||||||
# if no category is specified for this search,
|
# if no category is specified for this search,
|
||||||
# using user-defined default-configuration which
|
# using user-defined default-configuration which
|
||||||
|
|
Loading…
Reference in New Issue