I figured out why charset handling has been all broken lately.
The top of Nav_open_url has bool_t ForceReload = (URL_FLAGS(url) & (URL_E2EReload + URL_ReloadFromCache)); When repushing URLs, URL_FLAGS contains URL_ReloadFromCache, which is 0x100. And remember how Jorge changed bool_t from int to unsigned char? I'd forgotten about it, too, which meant I wasted some time looking in the wrong places for this bug.
On Thu, Apr 24, 2008 at 01:57:41AM +0000, corvid wrote:
The top of Nav_open_url has
bool_t ForceReload = (URL_FLAGS(url) & (URL_E2EReload + URL_ReloadFromCache));
When repushing URLs, URL_FLAGS contains URL_ReloadFromCache, which is 0x100. And remember how Jorge changed bool_t from int to unsigned char? I'd forgotten about it, too, which meant I wasted some time looking in the wrong places for this bug.
Ouch, this must have been fun to debug :-)
On Thu, Apr 24, 2008 at 01:57:41AM +0000, corvid wrote:
The top of Nav_open_url has
bool_t ForceReload = (URL_FLAGS(url) & (URL_E2EReload + URL_ReloadFromCache));
When repushing URLs, URL_FLAGS contains URL_ReloadFromCache, which is 0x100. And remember how Jorge changed bool_t from int to unsigned char? I'd forgotten about it, too, which meant I wasted some time looking in the wrong places for this bug.
Ooops, sorry. I thought the parenthesis wrapping was returning a boolean value. Patch committed. diff -pru dillo2/src/nav.c dillo2-cur/src/nav.c --- dillo2/src/nav.c 2008-04-08 17:50:25.000000000 -0400 +++ dillo2-cur/src/nav.c 2008-04-26 13:19:27.000000000 -0400 @@ -204,14 +204,14 @@ static void Nav_stack_clean(BrowserWindo static void Nav_open_url(BrowserWindow *bw, const DilloUrl *url, int offset) { DilloUrl *old_url; - bool_t MustLoad; + bool_t MustLoad, ForceReload; int x, y, idx, ClientKey; DilloWeb *Web; - bool_t ForceReload = (URL_FLAGS(url) & - (URL_E2EReload + URL_ReloadFromCache)); MSG("Nav_open_url: new url='%s'\n", URL_STR_(url)); + ForceReload = (URL_FLAGS(url) & (URL_E2EReload + URL_ReloadFromCache)) != 0; + /* Get the url of the current page */ idx = a_Nav_stack_ptr(bw); old_url = a_History_get_url(NAV_UIDX(bw, idx)); -- Cheers Jorge.-
participants (3)
-
corvid@lavabit.com
-
jcid@dillo.org
-
Johannes.Hofmann@gmx.de