~ubuntu-branches/ubuntu/hardy/lighttpd/hardy-updates

« back to all changes in this revision

Viewing changes to src/response.c

  • Committer: Bazaar Package Importer
  • Author(s): Lukas Fittl
  • Date: 2006-10-10 13:57:38 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010135738-gn4pp1ut1s1g27pb
Tags: 1.4.13~r1370-1ubuntu1
* Merge from Debian unstable (Closes: Malone #64900). Remaining changes:
  - Add an additional dependency on libterm-readline-perl-perl
    (Malone #43895)

Show diffs side-by-side

added added

removed removed

Lines of Context:
168
168
                 * - path
169
169
                 * - query
170
170
                 * 
171
 
                 * (scheme)://(authority)(path)?(query)
 
171
                 * (scheme)://(authority)(path)?(query)#fragment
172
172
                 * 
173
173
                 * 
174
174
                 */
182
182
                config_patch_connection(srv, con, COMP_HTTP_REFERER);   /* Referer:     */
183
183
                config_patch_connection(srv, con, COMP_HTTP_USERAGENT); /* User-Agent:  */
184
184
                config_patch_connection(srv, con, COMP_HTTP_COOKIE);    /* Cookie:  */
185
 
                
 
185
        
 
186
                /** their might be a fragment which has to be cut away */
 
187
                if (NULL != (qstr = strchr(con->request.uri->ptr, '#'))) {
 
188
                        con->request.uri->used = qstr - con->request.uri->ptr;
 
189
                        con->request.uri->ptr[con->request.uri->used++] = '\0';
 
190
                }
 
191
 
186
192
                /** extract query string from request.uri */
187
193
                if (NULL != (qstr = strchr(con->request.uri->ptr, '?'))) {
188
194
                        buffer_copy_string    (con->uri.query, qstr + 1);
563
569
                                }
564
570
                                
565
571
                                if (slash) pathinfo = slash;
566
 
                        } while ((found == 0) && (slash != NULL) && (slash - srv->tmp_buf->ptr > con->physical.basedir->used - 2));
 
572
                        } while ((found == 0) && (slash != NULL) && ((size_t)(slash - srv->tmp_buf->ptr) > (con->physical.basedir->used - 2)));
567
573
                        
568
574
                        if (found == 0) {
569
575
                                /* no it really doesn't exists */