Changeset 1869

Show
Ignore:
Timestamp:
08/19/08 13:24:20 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • cherokee/branches/0.8

    • Property svnmerge-integrated changed from /cherokee/trunk:1-1826,1842,1854,1857,1859,1864 to /cherokee/trunk:1-1826,1842,1854,1857,1859,1864,1867
  • cherokee/branches/0.8/ChangeLog

    r1866 r1869  
    33        * 0.8.1 released 
    44 
     5        * cherokee/handler_dirlist.c: Fixes a problem with redirections of 
     6        local user directories. 
     7         
    58        * admin/CherokeeManagement.py: Fixes a problem with the Hard 
    69        restart. Reported by Miguel Angel Ajo. 
  • cherokee/branches/0.8/cherokee/handler_dirlist.c

    r1858 r1869  
    472472                cherokee_buffer_ensure_size (&conn->redirect, len); 
    473473 
    474                 if (! cherokee_buffer_is_empty (&conn->userdir)) { 
    475                         cherokee_buffer_add_str (&conn->redirect, "/~"); 
    476                         cherokee_buffer_add_buffer (&conn->redirect, &conn->userdir); 
    477                 } 
    478  
    479474                /* In case the connection has a custom Document Root directory, 
    480475                 * it must add the web equivalent directory to the path (web_directory). 
     
    496491                                cherokee_buffer_add_long10 (&conn->redirect, CONN_SRV(conn)->port); 
    497492                        } 
     493                } 
     494         
     495                if (! cherokee_buffer_is_empty (&conn->userdir)) { 
     496                        cherokee_buffer_add_str (&conn->redirect, "/~"); 
     497                        cherokee_buffer_add_buffer (&conn->redirect, &conn->userdir); 
    498498                } 
    499499