[w3m-dev 03022] SSL certificates of frame body
* frame.h (frame_body): add ssl_certificate * frame.c (frame_download_source): save ssl_certificate * map.c (append_frame_info): display ssl_certificate of frame_body From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
		@@ -1,3 +1,10 @@
 | 
				
			|||||||
 | 
					2002-02-08  Fumitoshi UKAI  <ukai@debian.or.jp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* [w3m-dev 03022] SSL certificates of frame body
 | 
				
			||||||
 | 
						* frame.h (frame_body): add ssl_certificate
 | 
				
			||||||
 | 
						* frame.c (frame_download_source): save ssl_certificate
 | 
				
			||||||
 | 
						* map.c (append_frame_info): display ssl_certificate of frame_body
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2002-02-08  Fumitoshi UKAI  <ukai@debian.or.jp>
 | 
					2002-02-08  Fumitoshi UKAI  <ukai@debian.or.jp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* [w3m-dev 03021] Bug#132934: w3m should recognize file:/uris
 | 
						* [w3m-dev 03021] Bug#132934: w3m should recognize file:/uris
 | 
				
			||||||
@@ -2886,4 +2893,4 @@
 | 
				
			|||||||
	* release-0-2-1
 | 
						* release-0-2-1
 | 
				
			||||||
	* import w3m-0.2.1
 | 
						* import w3m-0.2.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$Id: ChangeLog,v 1.309 2002/02/08 11:37:09 ukai Exp $
 | 
					$Id: ChangeLog,v 1.310 2002/02/08 11:45:07 ukai Exp $
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								frame.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								frame.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
/* $Id: frame.c,v 1.10 2002/01/31 17:54:51 ukai Exp $ */
 | 
					/* $Id: frame.c,v 1.11 2002/02/08 11:45:07 ukai Exp $ */
 | 
				
			||||||
#include "fm.h"
 | 
					#include "fm.h"
 | 
				
			||||||
#include "parsetagx.h"
 | 
					#include "parsetagx.h"
 | 
				
			||||||
#include "myctype.h"
 | 
					#include "myctype.h"
 | 
				
			||||||
@@ -386,6 +386,10 @@ frame_download_source(struct frame_body *b, ParsedURL *currentURL,
 | 
				
			|||||||
	buf = loadGeneralFile(b->url,
 | 
						buf = loadGeneralFile(b->url,
 | 
				
			||||||
			      baseURL ? baseURL : currentURL,
 | 
								      baseURL ? baseURL : currentURL,
 | 
				
			||||||
			      b->referer, flag | RG_FRAME_SRC, b->request);
 | 
								      b->referer, flag | RG_FRAME_SRC, b->request);
 | 
				
			||||||
 | 
					#ifdef USE_SSL
 | 
				
			||||||
 | 
						/* XXX certificate? */
 | 
				
			||||||
 | 
						b->ssl_certificate = buf->ssl_certificate;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
	w3m_dump &= ~DUMP_FRAME;
 | 
						w3m_dump &= ~DUMP_FRAME;
 | 
				
			||||||
	is_redisplay = FALSE;
 | 
						is_redisplay = FALSE;
 | 
				
			||||||
	break;
 | 
						break;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								frame.h
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								frame.h
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
/* $Id: frame.h,v 1.3 2001/11/20 17:49:23 ukai Exp $ */
 | 
					/* $Id: frame.h,v 1.4 2002/02/08 11:45:07 ukai Exp $ */
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * frame support
 | 
					 * frame support
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -26,6 +26,9 @@ struct frame_body {
 | 
				
			|||||||
    char *referer;
 | 
					    char *referer;
 | 
				
			||||||
    struct _anchorList *nameList;
 | 
					    struct _anchorList *nameList;
 | 
				
			||||||
    FormList *request;
 | 
					    FormList *request;
 | 
				
			||||||
 | 
					#ifdef USE_SSL
 | 
				
			||||||
 | 
					    char *ssl_certificate;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
union frameset_element {
 | 
					union frameset_element {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										8
									
								
								map.c
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								map.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
/* $Id: map.c,v 1.6 2002/01/31 18:28:24 ukai Exp $ */
 | 
					/* $Id: map.c,v 1.7 2002/02/08 11:45:07 ukai Exp $ */
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * client-side image maps
 | 
					 * client-side image maps
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -310,6 +310,12 @@ append_frame_info(Buffer *buf, Str html, struct frameset *set, int level)
 | 
				
			|||||||
		Strcat_charp(html, " ");
 | 
							Strcat_charp(html, " ");
 | 
				
			||||||
		Strcat_charp(html, q);
 | 
							Strcat_charp(html, q);
 | 
				
			||||||
		Strcat_charp(html, "</a>\n");
 | 
							Strcat_charp(html, "</a>\n");
 | 
				
			||||||
 | 
					#ifdef USE_SSL
 | 
				
			||||||
 | 
							if (frame.body->ssl_certificate)
 | 
				
			||||||
 | 
							    Strcat_m_charp(html, "<blockquote><pre>\n",
 | 
				
			||||||
 | 
									   frame.body->ssl_certificate,
 | 
				
			||||||
 | 
									   "</pre></blockquote>\n", NULL);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
	    case F_FRAMESET:
 | 
						    case F_FRAMESET:
 | 
				
			||||||
		append_frame_info(buf, html, frame.set, level + 1);
 | 
							append_frame_info(buf, html, frame.set, level + 1);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user