Re: parse.cpp.patch

--G4iJoqBmSsgzjUCe
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Jens,

This is handled implicitly by lines 884 - 901 for first part and
lines 2199 - 2216 for second in current cvs HEAD.  That is, if the
new URI is relative (does not have schema / host / path) then the
parents schema / host / path are inherited.

Can you give an explicit example of where you see this failing to work.


Thanks,
Matt.

On Tue, 26 Aug 2003 at 18:55:48 +0200, Jens Thoms Toerring wrote:

> This is a patch I haven't mentioned yet. It's actually for two
> separate problems (sorry, Kir).
>=20
> The first one is related to "Location:" entries in the header
> the server sends. According to RFC2616 it should followed by
> an absoluteURI, but one some machines there's just an absolute
> path to a different page on the server instead. The first part
> of the patch is to deal with this more gracefully.
>=20
> The second patch is for cases where there are links in a document
> that start with a slash, i.e. something like
>=20
> <a href=3D"/foo/bar/xxx.html">
>=20
> As far as I can see these are not treated correctly (aspseek does
> not seem to follow these links), and that's what the second part
> of the patch is for.
>                                     Regards, Jens
> --=20
>  Freie Universitaet Berlin     Jens Thoms Toerring
>  Universitaetsbibliothek
>  Webteam                       Tel: 0049 30 838 56055
>  Garystrasse 39                Fax: 0049 30 838 53738
>  14195 Berlin                  e-mail: [email protected]
>=20
>=20
> --- aspseek-orig/src/parse.cpp	2003-08-19 13:50:25.000000000 +0200
> +++ aspseek-my/src/parse.cpp	2003-08-26 18:38:21.000000000 +0200
> @@ -876,6 +876,14 @@
>  				string location_unescaped;
>  				char *location_trim =3D str_trim(location);
>  				URIUnescapeSGML(location_trim, location_unescaped, ucontent.m_charse=
t);
> +
> +				// If the URI isn't RFC2616 conform, i.e. isn't a absoluteURI
> +				// but just a path prepend it by the server name in the hope
> +				// to make it an absoluteURI...
> +
> +				if ( *location_unescaped.c_str() =3D=3D '/' )
> +					location_unescaped =3D m_url + location_unescaped;
> +
>  				if (!newURL.ParseURL(location_unescaped.c_str()))
>  				{
>  					int newMethod;
> @@ -2187,6 +2195,13 @@
>  				string href_unescaped;
>  				char *href_trim =3D str_trim(href);
>  				URIUnescapeSGML(href_trim, href_unescaped, ucontent->m_charset);
> +
> +				// Prepend the reference with the server name etc. if it's an
> +				// absolute path, otherwise we get in trouble later
> +
> +				if ( *href_unescaped.c_str() =3D=3D '/' )
> +					href_unescaped =3D CurSrv->m_url + href_unescaped;
> +
>  				if (doc->m_hops >=3D CurSrv->m_maxhops)
>  				{
>  				}

--G4iJoqBmSsgzjUCe
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: http://sullivan.gen.nz/key.asc

iD8DBQE/S91nOIfg0ObmBIoRApmDAJ9+L27vYF1lo5Ojet75mU808rSWeQCfQcIB
SqKQKfsqSXGc9GLaDhRBT0Y=
=DTT2
-----END PGP SIGNATURE-----

--G4iJoqBmSsgzjUCe--