← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/response.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 13:15:59 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501131559-y8jos9wp79uf3pp4
Tags: 1.4.15-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - Add fam/gamin stat cache engine support
  - Clean environment in init.d script
  - Replace Depends: on perl with Depends: on libterm-readline-perl-perl
  - Make sure that upgrades succeed, even if we can't restart lighttpd
  - DebianMaintainerField update

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/response.c
66
66
                        BUFFER_APPEND_STRING_CONST(b, "\r\n");
67
67
                        buffer_append_string_buffer(b, ds->key);
68
68
                        BUFFER_APPEND_STRING_CONST(b, ": ");
 
69
#if 0
 
70
                        /** 
 
71
                         * the value might contain newlines, encode them with at least one white-space
 
72
                         */
 
73
                        buffer_append_string_encoded(b, CONST_BUF_LEN(ds->value), ENCODING_HTTP_HEADER);
 
74
#else
69
75
                        buffer_append_string_buffer(b, ds->value);
70
 
#if 0
71
 
                        log_error_write(srv, __FILE__, __LINE__, "bb",
72
 
                                        ds->key, ds->value);
73
76
#endif
74
77
                }
75
78
        }
98
101
                        BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION);
99
102
                } else {
100
103
                        BUFFER_APPEND_STRING_CONST(b, "\r\nServer: ");
101
 
                        buffer_append_string_buffer(b, con->conf.server_tag);
 
104
                        buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
102
105
                }
103
106
        }
104
107