Commit b7e53c14 authored by Tony Finch's avatar Tony Finch
Browse files

MF 1.3 the fis for the mod_rewrite stupidity. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87939 13f79535-47bb-0310-9956-ffa450edef68
parent 2f473926

CHANGES

+2 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Really fix mod_rewrite map lookups this time. [Tony Finch]



  *) Get the correct IP address if ServerName isn't set and we can't

     find a fully-qualified domain name at startup.

     PR#7170 [Danek Duvall <dduvall@eng.sun.com>]

modules/mappers/mod_rewrite.c

+2 −2
Original line number Diff line number Diff line
@@ -2308,11 +2308,11 @@ static void do_expand(request_rec *r, char *input, char *buffer, int nbuf, 
		char *map, *key, *dflt, *result;

		char xkey[MAX_STRING_LEN];

		char xdflt[MAX_STRING_LEN];

		key = find_char_in_brackets(inp, ':', '{', '}');

		key = find_char_in_brackets(inp+2, ':', '{', '}');

		if (key == NULL)

		    goto skip;

		map  = apr_pstrndup(r->pool, inp+2, key-inp-2);

		dflt = find_char_in_brackets(inp, '|', '{', '}');

		dflt = find_char_in_brackets(key+1, '|', '{', '}');

		if (dflt == NULL) {

		    key  = apr_pstrndup(r->pool, key+1, endp-key-1);

		    dflt = "";