diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | README | 56 | ||||
| -rw-r--r-- | config.h.in | 5 | ||||
| -rw-r--r-- | dlib/dlib.c | 5 | ||||
| -rw-r--r-- | src/IO/about.c | 76 | ||||
| -rw-r--r-- | src/IO/http.c | 2 | ||||
| -rw-r--r-- | src/cache.c | 10 | ||||
| -rw-r--r-- | src/gif.c | 2 | ||||
| -rw-r--r-- | src/uicmd.cc | 2 |
10 files changed, 119 insertions, 52 deletions
@@ -21,12 +21,15 @@ dillo-3.0 [not released yet] ----------------------------------------------------------------------------- -dillo-2.2.1 [not released yet] +dillo-2.2.1 [July 18, 2011] -+- Implemented "View source" as a dpi. ++- Fix fullwindow start. + - Implemented "View source" as a dpi. + - Fix: vsource html, fix entities display, indentation. - Accept application/xhtml+xml. - Small caps support. - Border-collapse, border-style properties. + - Removed gcc warnings for 64bit Patches: Jorge Arellano Cid +- Configurable User-Agent HTTP header. Patch: Alexander Voigt, corvid @@ -27,6 +27,12 @@ Sep 2007 The new FLTK2-based dillo code is released! (under GPL3) +Jul 2011 + + Dillo switches to fltk-1.3.0. + dillo-2.2.1, the last of the 2.x series is released. + + Jorge.- jcid@dillo.org Project maintainer, core developer, patcher, you name it! :-) @@ -2,28 +2,62 @@ Dillo web browser =================== - Dillo 2.2 features a major overhaul of the cookies subsystem, -a reimplementation of the Dillo Plugin (DPI) API, a configurable -connection limit, and various CSS improvements. +dillo-2.2.1 is the last of the dillo-2.x series: - This release is part of the Dillo2 series. In Dillo2, significant -parts of the codebase were ported to C++, and the rendering engine was -modified to use the FLTK2 library rather than GTK1. +The 2.x series was based on FLTK-2.0, which was never released. +As distributions have the sensible policy of not including alpha +software, this kept dillo from being provided in their native +packaging systems. - Here's a list of some well-known problems: +In response, the core team switched to the more modern FLTK-1.3 +which has already seen its first release. + +The development effort shifted to the dillo-3.x branch long ago, +and it became the active one (dillo-2.x received less and less +attention). + +The new dillo-3.0 will be available in a few weeks, after it passes +the final stages of the release process. It has shown excellent +stability and comes with some nice new features as well. + + Here's a list of some well-known problems of dillo-2.x: * no FRAMES rendering * no https (there's a barebones prototype). + ----- FLTK2 ----- The FLTK2 library is statically linked into Dillo2. - You can get it from fltk.org. -The recommended version is >= r6916. e.g. in: +The recommended version is >= r6916. and <=r7513 +If not available from fltk.org, you can get it here: + + http://www.dillo.org/dillo-2.x/fltk-2.0.x-r7513.tar.bz2 + + +-------------- +Building dillo +-------------- + + 1.- Install fltk: + + tar jxvf fltk-2.0.x-r7513.tar.bz2 + cd fltk-2.0.x-r7513 + less README.unix + make + sudo make install + cd .. + + (don't configure fltk with --enable-cairo) + + 2.- Then dillo2: - http://fltk.org/software.php?VERSION=2.0.x-r6916 + tar jxvf dillo-2.2.1.tar.bz2 + cd dillo-2.2.1 + ./autogen.sh; ./configure; make + sudo make install-strip ------------ @@ -67,4 +101,4 @@ Solaris Jorge.- (jcid@dillo.org) -June, 2009 +July, 2011 diff --git a/config.h.in b/config.h.in index fcffdf8f..371d658f 100644 --- a/config.h.in +++ b/config.h.in @@ -78,6 +78,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -103,7 +106,7 @@ #undef VERSION /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the #define below would cause a syntax error. */ #undef _UINT32_T diff --git a/dlib/dlib.c b/dlib/dlib.c index b87d0ce1..f2ef2dd1 100644 --- a/dlib/dlib.c +++ b/dlib/dlib.c @@ -877,11 +877,6 @@ char *dGetline (FILE *stream) dstr = dStr_sized_new(64); while ((ch = fgetc(stream)) != EOF) { - if (ch == '\\') { - /* continue with the next line */ - while ((ch = fgetc(stream)) != EOF && ch != '\n') ; - continue; - } dStr_append_c(dstr, ch); if (ch == '\n') break; diff --git a/src/IO/about.c b/src/IO/about.c index 508bfd11..132db8a1 100644 --- a/src/IO/about.c +++ b/src/IO/about.c @@ -240,20 +240,38 @@ const char *const AboutSplash= "<tr>\n" " <td bgcolor='#CCCCCC'>\n" " <h4>Release overview</h4>\n" -" February 11, 2010\n" +" July 18, 2011\n" "<tr>\n" " <td bgcolor='#FFFFFF'>\n" " <table border='0' cellspacing='0' cellpadding='5'>\n" " <tr>\n" " <td>\n" "<p>\n" -"This release features a major overhaul of the cookies subsystem,\n" -"a reimplementation of the DPI API, a configurable connection limit,\n" -"and various CSS improvements.\n" +"dillo-2.2.1 is the last of the dillo-2.x series:\n" +"<p>\n" +"The 2.x series\n" +"was based on FLTK-2.0,\n" +"which was never released. As distributions have the sensible policy\n" +"of not including alpha software, this kept dillo from being\n" +"provided in their native packaging systems.\n" +"<p>\n" +"In response, the core team switched to the more modern\n" +"<a href='http://fltk.org/articles.php?L1086'>FLTK-1.3</a> which\n" +"has already seen its first release. This opens the door\n" +"for dillo to be included in distros once again and reach our users\n" +"more easily.\n" +"<p>\n" +"The development effort shifted to the dillo-3.x branch long ago, and\n" +"it became the active one (dillo-2.x received less and less attention).\n" +"<p>\n" +"The new dillo-3.0 will be available in a few weeks, after it\n" +"passes the final stages of the release process. It has shown\n" +"excellent stability and comes with some nice new features as well.\n" +"<p>\n" +"Special thanks go to our longtime users and developers for\n" +"their support and help. We hope to keep surprising them\n" +"with the new features in the dillo-3.x series that is to come.\n" "<p>\n" -"Remember that the dillo project uses a release model where every new\n" -"version shall be better than the last.\n" -"<EM>Keep up with the latest one!</EM>\n" " </table>\n" "</table>\n" "</table>\n" @@ -266,7 +284,7 @@ const char *const AboutSplash= " <td bgcolor='#CCCCCC'>\n" " <h4>ChangeLog highlights</h4>\n" " (Extracted from the\n" -" <a href='http://hg.dillo.org/dillo/file/tip/ChangeLog'>full\n" +" <a href='http://dillo.org/dillo-2.x/ChangeLog'>full\n" " ChangeLog</a>)\n" "<tr>\n" " <td bgcolor='#FFFFFF'>\n" @@ -274,27 +292,25 @@ const char *const AboutSplash= " <tr>\n" " <td>\n" "<ul>\n" -"<li>Added keybindings for scrolling.\n" -"<li>Help button and local help file.\n" -"<li>Add support for multiple class names in CSS.\n" -"<li>Fix X11 coordinate overflows.\n" -"<li>Improve CSS font parsing.\n" -"<li>Enable font face setting via <font> element.\n" -"<li>Ignore XML comment markers in CSS.\n" -"<li>Fix user agent style for nested <ul>.\n" -"<li>Handle signed chars. Added dIsspace() and dIsalnum() to dlib.\n" -"<li>Changed the CCCs to build in one step (for both HTTP and DPI).\n" -"<li>Remove the empty cache entry lingering after connection abort.\n" -"<li>Fixed URL unescaping in the datauri DPI.\n" -"<li>Changed and reimplemented the DPI API.\n" -"<li>Allow linebreaks around Chinese/Japanese characters.\n" -"<li>Fix scrolling for text search.\n" -"<li>Tooltips.\n" -"<li>Enable popup menu below bottom of page content.\n" -"<li>Handle JPEGs with CMYK color space.\n" -"<li>General cookies overhaul.\n" -"<li>Fixed a bug in w3c_mode.\n" -"<li>Limit number of simultaneous connections.\n" +"<li>Fix fullwindow start.\n" +"<li>Implemented \"View source\" as a dpi.\n" +"<li>Fix: vsource html, fix entities display, indentation.\n" +"<li>Accept application/xhtml+xml.\n" +"<li>Small caps support.\n" +"<li>Border-collapse, border-style properties.\n" +"<li>Configurable User-Agent HTTP header.\n" +"<li>Work with libpng-1.4.\n" +"<li>Limit total number of cookies.\n" +"<li>Handle white-space: pre-wrap and pre-line.\n" +"<li>Support for the word-spacing property.\n" +"<li>Text-indent property.\n" +"<li>Reintroduce bg_color dillorc option.\n" +"<li>Support !important in style attributes.\n" +"<li>Implement line-height.\n" +"<li>Draw image maps when image not loaded.\n" +"<li>Support @media rules.\n" +"<li>Implement media-conditional @import rules.\n" +"<li>Fix meta refresh looping.\n" "</ul>\n" " </table>\n" "</table>\n" @@ -314,7 +330,7 @@ const char *const AboutSplash= " <td>\n" "<ul>\n" " <li> There's a\n" -" <a href='http://www.dillo.org/dillorc'>dillorc</a>\n" +" <a href='http://www.dillo.org/dillo-2.x/dillorc'>dillorc</a>\n" " (readable config) file within the tarball; It is well-commented\n" " and has plenty of options to customize dillo, so <STRONG>copy\n" " it</STRONG> to your <STRONG>~/.dillo/</STRONG> directory, and\n" diff --git a/src/IO/http.c b/src/IO/http.c index 137ff957..526b8460 100644 --- a/src/IO/http.c +++ b/src/IO/http.c @@ -365,7 +365,7 @@ static void Http_send_query(ChainLink *Info, SocketData_t *S) DataBuf *dbuf; /* Create the query */ - query = a_Http_make_query_str(S->web->url, S->flags & HTTP_SOCKET_USE_PROXY); + query = a_Http_make_query_str(S->web->url,S->flags & HTTP_SOCKET_USE_PROXY); dbuf = a_Chain_dbuf_new(query->str, query->len, 0); /* actually this message is sent too early. diff --git a/src/cache.c b/src/cache.c index d26ae610..5ea45511 100644 --- a/src/cache.c +++ b/src/cache.c @@ -893,6 +893,16 @@ void a_Cache_process_dbuf(int Op, const char *buf, size_t buf_size, MSG("entry->ExpectedSize = %d, entry->TransferSize = %d\n", entry->ExpectedSize, entry->TransferSize); } + if (!entry->TransferSize && !(entry->Flags & CA_Redirect) && + (entry->Flags & WEB_RootUrl)) { + char *eol = strchr(entry->Header->str, '\n'); + if (eol) { + char *status_line = dStrndup(entry->Header->str, + eol - entry->Header->str); + MSG_HTTP("Body was empty. Server sent status: %s\n", status_line); + dFree(status_line); + } + } entry->Flags |= CA_GotData; entry->Flags &= ~CA_Stopped; /* it may catch up! */ if (entry->TransferDecoder) { @@ -677,7 +677,7 @@ static int Gif_decode(DilloGif *gif, const uchar_t *buf, size_t bsize) case 2: /* End code... consume remaining data chunks..? */ goto error; /* Could clean up better? */ default: - printf("dillo_gif_decode: error!\n"); + MSG("Gif_decode: error!\n"); goto error; } } diff --git a/src/uicmd.cc b/src/uicmd.cc index 43dee783..361e42b3 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -464,7 +464,7 @@ void a_UIcmd_close_bw(void *vbw) UI *ui = BW2UI(bw); Layout *layout = (Layout*)bw->render_layout; - MSG("a_UIcmd_close_bw\n"); + _MSG("a_UIcmd_close_bw\n"); a_Bw_stop_clients(bw, BW_Root + BW_Img + BW_Force); delete(layout); if (ui->tabs()) { |