CVS update: php3
| From: | cschneid | Date: | Wed, 11 Nov 1998 23:19:01 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2346@lists.php.net to get a copy of this message | ||
Date: Wednesday November 11, 1998 @ 18:19
Author: cschneid
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv12692
Modified Files:
fopen-wrappers.c
Log Message:
Fixed some compilation warnings. Fixed gzgetc bug to make it binary safe.
Index: php3/fopen-wrappers.c
diff -c php3/fopen-wrappers.c:1.50 php3/fopen-wrappers.c:1.51
*** php3/fopen-wrappers.c:1.50 Tue Sep 22 10:59:53 1998
--- php3/fopen-wrappers.c Wed Nov 11 18:19:00 1998
***************
*** 27,33 ****
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.50 1998/09/22 14:59:53 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.51 1998/11/11 23:19:00 cschneid Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 514,524 ****
strcpy(scratch, resource->user);
strcat(scratch, ":");
strcat(scratch, resource->pass);
! tmp = _php3_base64_encode(scratch, strlen(scratch), NULL);
SOCK_WRITE("Authorization: Basic ", *socketd);
/* output "user:pass" as base64-encoded string */
! SOCK_WRITE(tmp, *socketd);
SOCK_WRITE("\n", *socketd);
efree(scratch);
efree(tmp);
--- 514,524 ----
strcpy(scratch, resource->user);
strcat(scratch, ":");
strcat(scratch, resource->pass);
! tmp = _php3_base64_encode((unsigned char *)scratch, strlen(scratch), NULL);
SOCK_WRITE("Authorization: Basic ", *socketd);
/* output "user:pass" as base64-encoded string */
! SOCK_WRITE((char *)tmp, *socketd);
SOCK_WRITE("\n", *socketd);
efree(scratch);
efree(tmp);
***************
*** 901,907 ****
return (fp);
}
! /* Should never get here. */
SOCK_FCLOSE(*socketd);
*socketd = 0;
return NULL;
--- 901,907 ----
return (fp);
}
! /* NOTREACHED */
SOCK_FCLOSE(*socketd);
*socketd = 0;
return NULL;
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net