Patch for http-access2, maybe workaround for a problem that is actually in MediaWiki
This commit is contained in:
parent
8ea9c02a37
commit
e53bd9ae65
2 changed files with 28 additions and 3 deletions
24
http-access2.rb.diff
Normal file
24
http-access2.rb.diff
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
--- http-access2.rb.orig 2005-10-05 21:55:04.000000000 +0200
|
||||||
|
+++ http-access2.rb 2005-10-05 22:49:05.000000000 +0200
|
||||||
|
@@ -1464,6 +1464,14 @@
|
||||||
|
timeout(@receive_timeout) do
|
||||||
|
begin
|
||||||
|
initial_line = socket.gets("\n")
|
||||||
|
+ if initial_line == "0\r\n"
|
||||||
|
+ # Regetting initial_line
|
||||||
|
+ initial_line = socket.gets("\n")
|
||||||
|
+ if initial_line == "\r\n"
|
||||||
|
+ # Regetting initial_line, again
|
||||||
|
+ initial_line = socket.gets("\n")
|
||||||
|
+ end
|
||||||
|
+ end
|
||||||
|
if initial_line.nil?
|
||||||
|
raise KeepAliveDisconnected.new
|
||||||
|
end
|
||||||
|
@@ -1586,3 +1594,5 @@
|
||||||
|
|
||||||
|
|
||||||
|
HTTPClient = HTTPAccess2::Client
|
||||||
|
+
|
||||||
|
+# vim:tabstop=8
|
||||||
|
|
|
@ -10,11 +10,12 @@ if ARGV.size() != 2
|
||||||
exit(1)
|
exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
$ical_url = "http://upcoming.org/calendar/metro/1551"
|
$ical_url = "webcal://upcoming.org/calendar/metro/1551"
|
||||||
|
$web_url = "http://upcoming.org/metro/de/bawue/ka/"
|
||||||
|
|
||||||
def get_events()
|
def get_events()
|
||||||
@client = HTTPAccess2::Client.new()
|
@client = HTTPAccess2::Client.new()
|
||||||
ical = @client.get_content($ical_url)
|
ical = @client.get_content($ical_url.gsub(/^webcal:/, "http:"))
|
||||||
events = []
|
events = []
|
||||||
Icalendar.decode(ical).each do |publish|
|
Icalendar.decode(ical).each do |publish|
|
||||||
publish.events.each do |event|
|
publish.events.each do |event|
|
||||||
|
@ -24,7 +25,7 @@ def get_events()
|
||||||
return events
|
return events
|
||||||
end
|
end
|
||||||
|
|
||||||
body = "Folgende Termine stammen von #{$ical_url}:\n\n"
|
body = "Folgende Termine stammen von #{$web_url} ([#{$ical_url} iCal]):\n\n"
|
||||||
get_events().each do |event|
|
get_events().each do |event|
|
||||||
body += "* #{event.dtstart.mday}.#{event.dtstart.month}. #{event.summary}\n"
|
body += "* #{event.dtstart.mday}.#{event.dtstart.month}. #{event.summary}\n"
|
||||||
end
|
end
|
||||||
|
|
Reference in a new issue