aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2010-03-05 00:54:54 +0000
committercorvid <corvid@lavabit.com>2010-03-05 00:54:54 +0000
commit88a56238b082bf1cfdc060f1499afb2d0f533ad9 (patch)
tree1140d6fdb2d2f617383046f7f272de558459d102
parent32156c2d8804f20ebc9be446eef11cb92b0ac22e (diff)
view source: CR separates lines
-rw-r--r--dpi/vsource.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/dpi/vsource.c b/dpi/vsource.c
index bc4ff246..e092a45a 100644
--- a/dpi/vsource.c
+++ b/dpi/vsource.c
@@ -123,9 +123,11 @@ void send_html_text(Dsh *sh, int data_size)
a_Dpip_dsh_write_str(sh, 0, line_str);
old_line = line;
}
- if ((p = strpbrk(q, "\n<&"))) {
- if (*p == '\n') {
+ if ((p = strpbrk(q, "\r\n<&"))) {
+ if (*p == '\r' || *p == '\n') {
a_Dpip_dsh_write(sh, 0, q, p - q + 1);
+ if (*p == '\r' && p[1] == '\n')
+ p++;
++line;
} else {
a_Dpip_dsh_write(sh, 0, q, p - q);