fix up request_uri [#45064]

Comment	File	Size	Author
#20	request_uri_3.patch	5.03 KB	chx

#19	request_uri_2.patch	4.96 KB	chx

#15	request_uri_1.patch	1.39 KB	chx

#12	request_uri_0.patch	1.41 KB	chx

#5	watchdog.module_0.patch	1.53 KB	m3avrck

Comment #1

kbahey CreditAttribution: kbahey commented 17 January 2006 at 16:18

I cannot reproduce this.

I tried with two sites, one is beta3 installed in a subdirectory, and the other is today's HEAD installed in documentroot.

Can you post what is in your $base_url from settings.php?

Log in or register to post comments

Comment #2

m3avrck CreditAttribution: m3avrck commented 17 January 2006 at 17:27

Yes I have latest HEAD too, very strange.

$base_url = 'http://localhost/drupal_cvs/drupal';

All of the location links are wrong (actually clicking the link that is). Hmmm, in the DB they are correct but some reason or other all of the parent folders are used twice. It seems it is a sub-directory issue, no?

Log in or register to post comments

Comment #3

kbahey CreditAttribution: kbahey commented 17 January 2006 at 17:39

From the looks of it, it seems that the part is duplicated:

?q=/drupal_cvs/drupal/?q=

Which theme are you using? Does it output a base href?

<base href="YOURBASEURL" />

If all else fails, try this:

- Download or checkout the latest Drupal HEAD.
- drop all tables in the database.
- Reinstall Drupal at the same location, with the same $base_url.
- Create the database.
- Check if watchdog still has an issue.

Log in or register to post comments

Comment #4

m3avrck CreditAttribution: m3avrck commented 17 January 2006 at 17:46

Using default bluemarine theme.

<base href="http://localhost/drupal_cvs/drupal/" />

I'll try clearing my database and what not soon enough, I just did this a few days ago, I still think this might be a sub-dir issue with either l() or url() or similar. Tried tracking it last night but good to tired, I'll look into this more soon.

Log in or register to post comments

Comment #5

m3avrck CreditAttribution: m3avrck commented 25 January 2006 at 20:09

Status:

Active

» Needs review

File	Size
watchdog.module_0.patch	1.53 KB

Ok here's a patch to fix this. Seems the problem stems from the fact that request_uri() will return say: '/drupal_cvs/drupal/?q=admin/node' and this is stored in $watchdog->location. However, this is then passed to l() where that whole string is appended to $base_url which causes this funky behavior.

Tested and working correctly now on Apache 2.0.55.

Log in or register to post comments

Comment #6

drewish CreditAttribution: drewish commented 21 February 2006 at 03:36

I don't think this patch will work. I'm running into this with clean URLs enabled and all my links end up like /node/231, the leading slash makes it useless. The base URL needs to be appended in some place. I'm going to do a little digging and see if I can get a patch working.

Log in or register to post comments

Comment #7

drewish CreditAttribution: drewish commented 21 February 2006 at 06:08

Comment #8

puregin CreditAttribution: puregin commented 23 February 2006 at 20:58

For some reason the offset of '+ 3' in the strpos() call seems to chop off too much when I tested this.

Log in or register to post comments

Comment #9

Dries CreditAttribution: Dries commented 1 March 2006 at 09:16

Status:

Needs review

» Needs work

I think we should change request_uri() to return a different URL. It should return URLs relative to the base url, not relative to the root.

This will also fix the use of request_uri() in the page caching.

Log in or register to post comments

Comment #10

markus_petrux CreditAttribution: markus_petrux commented 1 March 2006 at 09:30

hmmm... is this one related? a dup?
http://drupal.org/node/47255

Log in or register to post comments

Comment #11

m3avrck CreditAttribution: m3avrck commented 1 March 2006 at 14:57

Seems related to me.

And another one: http://drupal.org/node/41595

Log in or register to post comments

Comment #12

chx CreditAttribution: chx commented 10 March 2006 at 00:27

Status:

Needs work

» Needs review

File	Size
request_uri_0.patch	1.41 KB

This was a hell to roll. I am afraid a bit that this will break already existing translations? Killes, please comment.

Log in or register to post comments

Comment #13

chx CreditAttribution: chx commented 10 March 2006 at 00:55

This little excerpt from IRC can't replace the full review which I hope will shortly follow, but from IRC talk it seems killes is OK with the change and it won't break locale. How OK he is with the change -- we shall see when he commits. To further that -- review please!

Log in or register to post comments

Comment #14

chx CreditAttribution: chx commented 10 March 2006 at 01:00

after this patch, we get the aliased drupal path + querystring in request_uri. I am not sure about the slash in front. I will give it some more thought...

Log in or register to post comments

Comment #15

chx CreditAttribution: chx commented 10 March 2006 at 01:09

Status:

Needs review

» Needs work

File	Size
request_uri_1.patch	1.39 KB

For reasons unknown my system went over to rolling -p1 patches. I will investigate. Anyways... it seems that a) slash trimmign is not needed b) unclean urls are a problem -- the equal sign of ?q= is still encoded at watchdog. But it's progress, still.

Log in or register to post comments

Comment #16

chx CreditAttribution: chx commented 10 March 2006 at 01:12

Title:	Watchdog location link wrong	» fix up request_uri
Component:	watchdog.module	» base system
Assigned:	Unassigned	» chx
Category:	bug	» task
Priority:	Minor	» Critical