Changeset 1005

Timestamp:

02/22/2006 12:50:56 PM (2 years ago)

Author:

jan

Message:

handle 'foo.php... == foo.php' case on windows/dos

Files:

• branches/lighttpd-merge-1.4.x/src/response.c (modified) (1 diff)

branches/lighttpd-merge-1.4.x/src/response.c

@@ -321 +321 @@
                 buffer_copy_string_buffer(con->physical.rel_path, con->uri.path);
                 
+                /* strip dots from the end and spaces
+                 *
+                 * windows/dos handle those filenames as the same file
+                 *
+                 * foo == foo. == foo..... == "foo...   " == "foo..  ./"
+                 *
+                 * This will affect in some cases PATHINFO
+                 *
+                 * */
+                if (con->physical.rel_path->used > 1) {
+                        buffer *b = con->physical.rel_path;
+                        size_t i;
+
+                        if (b->used > 2 &&
+                            b->ptr[b->used-2] == '/' &&
+                            (b->ptr[b->used-3] == ' ' ||
+                             b->ptr[b->used-3] == '.')) {
+                                b->ptr[b->used--] = '\0';
+                        }
+
+                        for (i = b->used - 2; b->used > 1; i--) {
+                                if (b->ptr[i] == ' ' ||
+                                    b->ptr[i] == '.') {
+                                        b->ptr[b->used--] = '\0';
+                                } else {
+                                        break;
+                                }
+                        }
+                }
+
                 if (con->conf.log_request_handling) {
                         log_error_write(srv, __FILE__, __LINE__,  "s",  "-- before doc_root");