CVS update: php3
| From: | sas | Date: | Fri, 18 Jun 1999 12:13:04 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7069@lists.php.net to get a copy of this message | ||
Date: Friday June 18, 1999 @ 8:13
Author: sas
Update of /repository/php3
In directory php:/tmp/cvs-serv6789
Modified Files:
fopen-wrappers.c
Log Message:
fix socket stuff - file() do work now
Index: php3/fopen-wrappers.c
diff -u php3/fopen-wrappers.c:1.64 php3/fopen-wrappers.c:1.65
--- php3/fopen-wrappers.c:1.64 Wed Jun 16 07:34:12 1999
+++ php3/fopen-wrappers.c Fri Jun 18 08:13:04 1999
@@ -27,7 +27,7 @@
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen-wrappers.c,v 1.64 1999/06/16 11:34:12 ssb Exp $ */
+/* $Id: fopen-wrappers.c,v 1.65 1999/06/18 12:13:04 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
@@ -542,7 +542,7 @@
SOCK_WRITE("?", *socketd);
SOCK_WRITE(resource->query, *socketd);
}
- SOCK_WRITE(" HTTP/1.0\n", *socketd);
+ SOCK_WRITE(" HTTP/1.0\r\n", *socketd);
/* send authorization header if we have user/pass */
if (resource->user != NULL && resource->pass != NULL) {
@@ -559,7 +559,7 @@
SOCK_WRITE("Authorization: Basic ", *socketd);
/* output "user:pass" as base64-encoded string */
SOCK_WRITE((char *)tmp, *socketd);
- SOCK_WRITE("\n", *socketd);
+ SOCK_WRITE("\r\n", *socketd);
efree(scratch);
efree(tmp);
}
@@ -567,7 +567,7 @@
if (cfg_get_string("from", &scratch) == SUCCESS) {
SOCK_WRITE("From: ", *socketd);
SOCK_WRITE(scratch, *socketd);
- SOCK_WRITE("\n", *socketd);
+ SOCK_WRITE("\r\n", *socketd);
}
/* send a Host: header so name-based virtual hosts work */
SOCK_WRITE("Host: ", *socketd);
@@ -577,15 +577,15 @@
SOCK_WRITE(":", *socketd);
SOCK_WRITE(tmp_line, *socketd);
}
- SOCK_WRITE("\n", *socketd);
+ SOCK_WRITE("\r\n", *socketd);
/* identify ourselves */
SOCK_WRITE("User-Agent: PHP/", *socketd);
SOCK_WRITE(PHP_VERSION, *socketd);
- SOCK_WRITE("\n", *socketd);
+ SOCK_WRITE("\r\n", *socketd);
/* end the headers */
- SOCK_WRITE("\n", *socketd);
+ SOCK_WRITE("\r\n", *socketd);
/* Read past http header */
body = 0;