You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/11/19 11:30:50 UTC
jena git commit: Revert "JENA-1632: https support in SOH scripts"
Repository: jena
Updated Branches:
refs/heads/master 9aae2ee1f -> f535eb05a
Revert "JENA-1632: https support in SOH scripts"
This reverts commit 2e275fdd048f895d6eeee76650198047a2a7761b.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f535eb05
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f535eb05
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f535eb05
Branch: refs/heads/master
Commit: f535eb05a53c3f991c8256f579a2ad5b6b22e17c
Parents: 9aae2ee
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 19 11:30:35 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 19 11:30:35 2018 +0000
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-get | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-head | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-post | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-put | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-query | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/s-update | 30 +++++++++-----------
.../apache-jena-fuseki/bin/s-update-form | 30 +++++++++-----------
jena-fuseki2/apache-jena-fuseki/bin/soh | 30 +++++++++-----------
9 files changed, 126 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-delete
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-delete b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-delete
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-get
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-get b/jena-fuseki2/apache-jena-fuseki/bin/s-get
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-get
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-get
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-head
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-head b/jena-fuseki2/apache-jena-fuseki/bin/s-head
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-head
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-head
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-post
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-post b/jena-fuseki2/apache-jena-fuseki/bin/s-post
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-post
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-post
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-put
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-put b/jena-fuseki2/apache-jena-fuseki/bin/s-put
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-put
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-put
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-query
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-query b/jena-fuseki2/apache-jena-fuseki/bin/s-query
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-query
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-query
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-update
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update b/jena-fuseki2/apache-jena-fuseki/bin/s-update
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f535eb05/jena-fuseki2/apache-jena-fuseki/bin/soh
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/soh b/jena-fuseki2/apache-jena-fuseki/bin/soh
index fee3dad..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/soh
+++ b/jena-fuseki2/apache-jena-fuseki/bin/soh
@@ -21,7 +21,6 @@
require 'optparse'
require 'net/http'
-require 'openssl'
require 'uri'
require 'cgi'
require 'pp'
@@ -43,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -63,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -76,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
@@ -216,15 +216,13 @@ def response_no_body(uri, request)
http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
http.read_timeout = nil
# check we can connect.
- begin http.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
- response = http.request(request)
- end
+ begin http.start
rescue Exception => e
# puts e.message
#puts e.backtrace.inspect
warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
- #response = http.request(request)
+ response = http.request(request)
print_http_response(response)
case response
when Net::HTTPSuccess, Net::HTTPRedirection
@@ -241,16 +239,16 @@ def response_no_body(uri, request)
end
def response_print_body(uri, request)
- http = Net::HTTP.new(uri.host, uri.port)
- if uri.scheme == 'https'
- http.use_ssl = uri.scheme == 'https'
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
- http.start do |http|
- request = Net::HTTP::Get.new uri
- response = http.request request
+ http = Net::HTTP::Proxy($proxy.host,$proxy.port).new(uri.host, uri.port)
+ http.read_timeout = nil
+ # check we can connect.
+ begin http.start
+ rescue => e
+ #puts e.backtrace.inspect
+ #print e.class
+ warn_exit "Failed to connect: #{uri.host}:#{uri.port}: #{e.message}", 3
end
-
+
# Add a blank line if headers were output.
print "\n" if $http_print ;