CVS update: php3
| From: | zeev | Date: | Fri, 11 Sep 1998 23:47:16 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-986@lists.php.net to get a copy of this message | ||
Date: Friday September 11, 1998 @ 19:47
Author: zeev
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv27168
Modified Files:
ChangeLog fopen-wrappers.c
Log Message:
Fix for #732
Index: php3/ChangeLog
diff -c php3/ChangeLog:1.476 php3/ChangeLog:1.477
*** php3/ChangeLog:1.476 Thu Sep 10 17:27:17 1998
--- php3/ChangeLog Fri Sep 11 19:47:15 1998
***************
*** 1,6 ****
--- 1,9 ----
PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Version 3.0.4
+ - Improved stripping of URL passwords from error messages - the length of the
+ username/password isn't obvious now, and all protocols are handled properly
+ (most importantly, http).
- Copying objects that had member functions with static variables produced
undetermined results. Fixed.
- Added function lstat() and cleaned up the status functions,
Index: php3/fopen-wrappers.c
diff -c php3/fopen-wrappers.c:1.45 php3/fopen-wrappers.c:1.46
*** php3/fopen-wrappers.c:1.45 Thu Aug 20 08:40:58 1998
--- php3/fopen-wrappers.c Fri Sep 11 19:47:16 1998
***************
*** 27,33 ****
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.45 1998/08/20 12:40:58 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: fopen-wrappers.c,v 1.46 1998/09/11 23:47:16 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 877,894 ****
return (!strncasecmp(path, "http://", 7) ||
!strncasecmp(path, "ftp://", 6));
}
! PHPAPI char *php3_strip_url_passwd(char *path)
{
! char *tmppath = NULL;
! if (!strncasecmp(path, "ftp://", 6)) {
! tmppath = path;
! tmppath += 6;
! for (; *tmppath != ':' && *tmppath != '\0'; tmppath++);
! tmppath++;
! for (; *tmppath != '@' && *tmppath != '\0'; tmppath++)
! *tmppath = '*';
}
! return (path);
}
--- 877,912 ----
return (!strncasecmp(path, "http://", 7) ||
!strncasecmp(path, "ftp://", 6));
}
!
! PHPAPI char *php3_strip_url_passwd(char *url)
{
! register char *p = url, *url_start;
!
! while (*p) {
! if (*p==':' && *(p+1)=='/' && *(p+2)=='/') {
! /* found protocol */
! url_start = p = p+3;
!
! while (*p) {
! if (*p=='@') {
! int i;
!
! for (i=0; i<3 && url_start<p; i++, url_start++) {
! *url_start = '.';
! }
! for (; *p; p++) {
! *url_start++ = *p;
! }
! *url_start=0;
! break;
! }
! p++;
! }
! return url;
! }
! p++;
}
! return url;
}
--
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