diff -pru dillo-0.8.3-rc3/ChangeLog dillo-0.8.3/ChangeLog --- dillo-0.8.3-rc3/ChangeLog 2004-10-22 10:12:44.000000000 -0300 +++ dillo-0.8.3/ChangeLog 2004-10-25 08:08:57.000000000 -0300 @@ -2,7 +2,7 @@ Dillo project ============================================================================= -dillo-0.8.3 [??, 2004] +dillo-0.8.3 [Oct, 27 2004] - * Added a missing error handler for unreachable host in http.c. Patch: Dennis Schneider, Jorge Arellano Only in dillo-0.8.3: Makefile Only in dillo-0.8.3: autom4te.cache Only in dillo-0.8.3: config.h Only in dillo-0.8.3: config.log Only in dillo-0.8.3: config.status diff -pru dillo-0.8.3-rc3/configure dillo-0.8.3/configure --- dillo-0.8.3-rc3/configure 2004-10-22 10:27:13.000000000 -0300 +++ dillo-0.8.3/configure 2004-10-25 08:12:32.000000000 -0300 @@ -1706,7 +1706,7 @@ fi # Define the identity of the package. PACKAGE=dillo - VERSION=0.8.3-rc3 + VERSION=0.8.3 cat >>confdefs.h <<_ACEOF diff -pru dillo-0.8.3-rc3/configure.in dillo-0.8.3/configure.in --- dillo-0.8.3-rc3/configure.in 2004-10-22 10:13:04.000000000 -0300 +++ dillo-0.8.3/configure.in 2004-10-25 08:06:27.000000000 -0300 @@ -5,7 +5,7 @@ AC_INIT(src/dillo.c) dnl Detect the canonical host and target build environment AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(dillo, 0.8.3-rc3) +AM_INIT_AUTOMAKE(dillo, 0.8.3) AM_CONFIG_HEADER(config.h) dnl Options Only in dillo-0.8.3/doc: Makefile Only in dillo-0.8.3/dpi: .deps Only in dillo-0.8.3/dpi: Makefile Only in dillo-0.8.3/dpi: bookmarks.dpi Only in dillo-0.8.3/dpi: bookmarks.o Only in dillo-0.8.3/dpi: downloads.dpi Only in dillo-0.8.3/dpi: downloads.o Only in dillo-0.8.3/dpi: dpiutil.o Only in dillo-0.8.3/dpi: file.dpi Only in dillo-0.8.3/dpi: file.o Only in dillo-0.8.3/dpi: ftp.filter.dpi Only in dillo-0.8.3/dpi: ftp.o Only in dillo-0.8.3/dpi: hello.filter.dpi Only in dillo-0.8.3/dpi: hello.o Only in dillo-0.8.3/dpi: https.filter.dpi Only in dillo-0.8.3/dpi: https.o Only in dillo-0.8.3/dpid: .deps Only in dillo-0.8.3/dpid: Makefile Only in dillo-0.8.3/dpid: dpi.o Only in dillo-0.8.3/dpid: dpi_service.o Only in dillo-0.8.3/dpid: dpi_socket_dir.o Only in dillo-0.8.3/dpid: dpid Only in dillo-0.8.3/dpid: dpid.o Only in dillo-0.8.3/dpid: dpid_common.o Only in dillo-0.8.3/dpid: main.o Only in dillo-0.8.3/dpid: misc_new.o Only in dillo-0.8.3: out Only in dillo-0.8.3/src: .deps Only in dillo-0.8.3/src/IO: .deps Only in dillo-0.8.3/src/IO: IO.o Only in dillo-0.8.3/src/IO: Makefile Only in dillo-0.8.3/src/IO: Url.o diff -pru dillo-0.8.3-rc3/src/IO/about.c dillo-0.8.3/src/IO/about.c --- dillo-0.8.3-rc3/src/IO/about.c 2004-10-22 10:25:12.000000000 -0300 +++ dillo-0.8.3/src/IO/about.c 2004-10-25 08:07:58.000000000 -0300 @@ -263,7 +263,7 @@ static char *Splash= "\n" " \n" "

Release overview

\n" -" 22 October 2004\n" +" 27 October 2004\n" "\n" " \n" " \n" @@ -284,7 +284,7 @@ static char *Splash= " and very limited, it was disabled by default. Please read the " "FAQ if you want to enable it.\n" "

\n" -" Parsing of cookies was extended, so you favorite site may work now.\n" +" Parsing of cookies was extended, so your favorite site may work now.\n" "

\n" "Remember that dillo project uses a release model where every new\n" "browser shall be better than the former.\n" Only in dillo-0.8.3/src/IO: about.o Only in dillo-0.8.3/src/IO: dpi.o Only in dillo-0.8.3/src/IO: http.o Only in dillo-0.8.3/src/IO: libDio.a Only in dillo-0.8.3/src/IO: mime.o Only in dillo-0.8.3/src/IO: proto.o Only in dillo-0.8.3/src: Makefile Only in dillo-0.8.3/src: bitvec.o Only in dillo-0.8.3/src: bookmark.o diff -pru dillo-0.8.3-rc3/src/cache.c dillo-0.8.3/src/cache.c --- dillo-0.8.3-rc3/src/cache.c 2004-10-22 10:12:44.000000000 -0300 +++ dillo-0.8.3/src/cache.c 2004-10-25 15:57:18.000000000 -0300 @@ -633,7 +633,7 @@ static gint Cache_get_header(IOData_t *i if ( N == 2 ){ /* Got whole header */ - DEBUG_MSG(2, "Header [io_len=%d]\n%s", i, hdr->str); + MSG("Header [io_len=%d]\n%s", i, hdr->str); entry->Flags |= CA_GotHeader; /* Return number of original-header bytes in this io [1 based] */ return i; @@ -725,12 +725,15 @@ static gint Cache_redirect(CacheData_t * { DilloUrl *NewUrl; + MSG(" Cache_redirect: redirect_level = %d\n", bw->redirect_level); + /* if there's a redirect loop, stop now */ if (bw->redirect_level >= 5) entry->Flags |= CA_RedirectLoop; if (entry->Flags & CA_RedirectLoop) { a_Interface_msg(bw, "ERROR: redirect loop for: %s", URL_STR_(entry->Url)); + bw->redirect_level = 0; return 0; } @@ -763,12 +766,25 @@ static gint Cache_redirect(CacheData_t * } /* - * Do nothing, but let the cache fill the entry. - * (Currently used to ignore image redirects --Jcid) + * Don't process data any further, but let the cache fill the entry. + * (Currently used to handle WEB_RootUrl redirects, + * and to ignore image redirects --Jcid) */ void a_Cache_null_client(int Op, CacheClient_t *Client) { - return; + DilloWeb *Web = Client->Web; + + /* make the stop button insensitive when done */ + if (Op == CA_Close) { + if (Web->flags & WEB_RootUrl) { + /* Remove this client from our active list */ + a_Interface_close_client(Web->bw, Client->Key); + } + } + + /* else ignore */ + + return; } /* @@ -810,8 +826,10 @@ static void Cache_process_queue(CacheDat entry->Flags |= CA_MsgErased; } if (entry->Flags & CA_Redirect) { - Client->Callback = a_Cache_null_client; - Client_bw->redirect_level++; + if (!Client->Callback) { + Client->Callback = a_Cache_null_client; + Client_bw->redirect_level++; + } } else { Client_bw->redirect_level = 0; } @@ -857,8 +875,13 @@ static void Cache_process_queue(CacheDat (Client->Callback)(CA_Close, Client); Cache_client_dequeue(Client, NULLKey); --i; /* Keep the index value in the next iteration */ + + /* call Cache_redirect() from this 'if' to assert one call only. */ if ( entry->Flags & CA_Redirect ) Cache_redirect(entry, flags, Client_bw); + + MSG(" Cache_process_queue: NumRootClients=%d sens_idle_id = %d\n", + Client_bw->NumRootClients, Client_bw->sens_idle_id); } } } /* for */ Only in dillo-0.8.3/src: cache.o Only in dillo-0.8.3/src: capi.o Only in dillo-0.8.3/src: chain.o Only in dillo-0.8.3/src: colors.o Only in dillo-0.8.3/src: commands.o Only in dillo-0.8.3/src: cookies.o Only in dillo-0.8.3/src: d083rc3 Only in dillo-0.8.3/src: dicache.o Only in dillo-0.8.3/src: dillo Only in dillo-0.8.3/src: dillo.o Only in dillo-0.8.3/src: dns.o Only in dillo-0.8.3/src: dpiapi.o Only in dillo-0.8.3/src: dw.o Only in dillo-0.8.3/src: dw_aligned_page.o Only in dillo-0.8.3/src: dw_bullet.o Only in dillo-0.8.3/src: dw_button.o Only in dillo-0.8.3/src: dw_container.o Only in dillo-0.8.3/src: dw_embed_gtk.o Only in dillo-0.8.3/src: dw_ext_iterator.o Only in dillo-0.8.3/src: dw_gtk_scrolled_frame.o Only in dillo-0.8.3/src: dw_gtk_scrolled_window.o Only in dillo-0.8.3/src: dw_gtk_statuslabel.o Only in dillo-0.8.3/src: dw_gtk_viewport.o Only in dillo-0.8.3/src: dw_hruler.o Only in dillo-0.8.3/src: dw_image.o Only in dillo-0.8.3/src: dw_list_item.o Only in dillo-0.8.3/src: dw_marshal.o Only in dillo-0.8.3/src: dw_page.o Only in dillo-0.8.3/src: dw_style.o Only in dillo-0.8.3/src: dw_table.o Only in dillo-0.8.3/src: dw_table_cell.o Only in dillo-0.8.3/src: dw_tooltip.o Only in dillo-0.8.3/src: dw_widget.o Only in dillo-0.8.3/src: findtext.o Only in dillo-0.8.3/src: gif.o Only in dillo-0.8.3/src: gtk_ext_button.o Only in dillo-0.8.3/src: gtk_ext_menu.o Only in dillo-0.8.3/src: gtk_ext_menu_item.o Only in dillo-0.8.3/src: gtk_menu_title.o Only in dillo-0.8.3/src: history.o Only in dillo-0.8.3/src: html.o Only in dillo-0.8.3/src: image.o Only in dillo-0.8.3/src: interface.o Only in dillo-0.8.3/src: jpeg.o Only in dillo-0.8.3/src: klist.o Only in dillo-0.8.3/src: menu.o Only in dillo-0.8.3/src: misc.o diff -pru dillo-0.8.3-rc3/src/nav.c dillo-0.8.3/src/nav.c --- dillo-0.8.3-rc3/src/nav.c 2004-08-12 17:19:23.000000000 -0400 +++ dillo-0.8.3/src/nav.c 2004-10-25 09:07:20.000000000 -0300 @@ -157,6 +157,7 @@ static void Nav_open_url(BrowserWindow * gboolean ForceReload = (URL_FLAGS(url) & URL_E2EReload); MSG("Nav_open_url: Url=>%s<\n", URL_STR_(url)); + MSG("Nav_open_url: redirect_level = %d\n", bw->redirect_level); /* Get the url of the current page */ if ( a_Nav_stack_ptr(bw) != -1 ) Only in dillo-0.8.3/src: nav.o Only in dillo-0.8.3/src: plain.o Only in dillo-0.8.3/src: png.o Only in dillo-0.8.3/src: prefs.o Only in dillo-0.8.3/src: progressbar.o Only in dillo-0.8.3/src: selection.o Only in dillo-0.8.3/src: strbuf.o Only in dillo-0.8.3/src: url.o Only in dillo-0.8.3/src: web.o Only in dillo-0.8.3: stamp-h1