Permalink
Browse files

https

  • Loading branch information...
MIZUNUMA Yuto
MIZUNUMA Yuto committed May 30, 2011
1 parent 2d11e2b commit e748a13c60ec5389e9157d7414c80f19eeb225ec
Showing with 9 additions and 5 deletions.
  1. +4 −0 ChangeLog
  2. +3 −3 navi2ch-net.el
  3. +2 −2 navi2ch-thumbnail.el
View
@@ -1,5 +1,9 @@
2011-05-30 MIZUNUMA Yuto <mizmiz@sf.net>
+ * navi2ch-thumbnail.el (navi2ch-thumbnail-show-image-subr): httpsにも対応
+
+ * navi2ch-net.el (navi2ch-net-split-url): httpsにも対応
+
* navi2ch-thumbnail.el (navi2ch-thumbnail-image-jpeg-identify):
bugfix 読み込みが8byte多かった
(navi2ch-thumbnail-select-current-link): 踏んだリンクが画像かどうかのチェックを追加
View
@@ -303,7 +303,7 @@ nil $B$J$i>o$K:F@\B3$9$k!#(B")
(defun navi2ch-net-split-url (url &optional proxy)
(let (host2ch authinfo user pass)
- (string-match "http://\\([^@/]+@\\)?\\([^/]+\\)" url)
+ (string-match "https?://\\([^@/]+@\\)?\\([^/]+\\)" url)
(when (setq authinfo (match-string 1 url))
(save-match-data
(string-match "\\(?:\\([^:]+\\):\\)?\\(.*\\)@" authinfo)
@@ -314,15 +314,15 @@ nil $B$J$i>o$K:F@\B3$9$k!#(B")
(setq host2ch (match-string 2 url))
(if proxy
(progn
- (string-match "^\\(http://\\)?\\(.*\\):\\([0-9]+\\)" proxy)
+ (string-match "^\\(https?://\\)?\\(.*\\):\\([0-9]+\\)" proxy)
(list
(cons 'user user)
(cons 'pass pass)
(cons 'host (match-string 2 proxy))
(cons 'file url)
(cons 'port (string-to-number (match-string 3 proxy)))
(cons 'host2ch host2ch)))
- (string-match "http://\\(?:[^@/]+@\\)?\\([^/:]+\\)\\(?::\\([0-9]+\\)\\)?\\(.*\\)" url)
+ (string-match "https?://\\(?:[^@/]+@\\)?\\([^/:]+\\)\\(?::\\([0-9]+\\)\\)?\\(.*\\)" url)
(list
(cons 'user user)
(cons 'pass pass)
View
@@ -461,7 +461,7 @@
thumb-file file width height size anime filename
image-attr)
(unless (and (stringp org-url)
- (string-match "tp://\\(.+\\)$" org-url))
+ (string-match "tps?://\\(.+\\)$" org-url))
(error "URL not match"))
(setq file (expand-file-name
(navi2ch-thumbnail-image-escape-filename
@@ -556,7 +556,7 @@
(if anime " GIF ANIME" "") (round (/ size 1024))))
(when (re-search-forward
- (concat "h?ttp://\\([^ \t\n\r]+\\."
+ (concat "h?ttps?://\\([^ \t\n\r]+\\."
(regexp-opt navi2ch-browse-url-image-extentions t)
"\\)") nil t)
(save-excursion

0 comments on commit e748a13

Please sign in to comment.