[PHP4BETA] CVS update: php4/ext/standard

Date: Sunday April 18, 1999 @ 11:58 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv9160/ext/standard Modified Files: exec.c file.c formatted_print.c fsock.c fsock.h info.c pack.c string.c var.c Log Message: Make Win32 happy with the recent changes. Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.1 php4/ext/standard/exec.c:1.2 --- php4/ext/standard/exec.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/exec.c Sun Apr 18 11:58:26 1999 @@ -26,7 +26,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: exec.c,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -36,7 +36,7 @@ #include <ctype.h> #include "php3_string.h" #include "safe_mode.h" -#include "head.h" +#include "functions/head.h" #include "exec.h" #include "php_globals.h" Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.1 php4/ext/standard/file.c:1.2 --- php4/ext/standard/file.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/file.c Sun Apr 18 11:58:26 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: file.c,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -49,7 +49,7 @@ #include <sys/socket.h> /* #include <sys/uio.h> */ #endif -#include "head.h" +#include "functions/head.h" #include "safe_mode.h" #include "php3_string.h" #include "file.h" Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.1 php4/ext/standard/formatted_print.c:1.2 --- php4/ext/standard/formatted_print.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/formatted_print.c Sun Apr 18 11:58:26 1999 @@ -27,14 +27,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: formatted_print.c,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ #include <math.h> /* modf() */ #ifdef THREAD_SAFE #include "tls.h" #endif #include "php.h" -#include "head.h" +#include "functions/head.h" #include "php3_string.h" #include "zend_execute.h" #include <stdio.h> Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.1 php4/ext/standard/fsock.c:1.2 --- php4/ext/standard/fsock.c:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/fsock.c Sun Apr 18 11:58:26 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: fsock.c,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -60,7 +60,7 @@ #include "base64.h" #include "file.h" -#include "post.h" +#include "functions/post.h" #include "url.h" #include "fsock.h" @@ -96,8 +96,8 @@ static struct php3i_sockbuf *phpsockbuf; static int php3_minit_fsock(INIT_FUNC_ARGS); -static int php3_mshutdown_fsock(void); -static int php3_rshutdown_fsock(void); +static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS); +static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS); php3_module_entry fsock_module_entry = { "Socket functions", fsock_functions, php3_minit_fsock, php3_mshutdown_fsock, NULL, php3_rshutdown_fsock, NULL, STANDARD_MODULE_PROPERTIES @@ -363,7 +363,8 @@ sockbuf->next = phpsockbuf; phpsockbuf = sockbuf; } else { - int needlen = sockbuf->writepos + buflen; + uint needlen = sockbuf->writepos + buflen; + if (needlen > sockbuf->readbuflen) { sockbuf->readbuflen += maxlen; sockbuf->readbuf = erealloc(sockbuf->readbuf, sockbuf->readbuflen); @@ -440,7 +441,7 @@ /* }}} */ /* {{{ php3_mshutdown_fsock */ -static int php3_mshutdown_fsock(void) +static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS) { #ifndef THREAD_SAFE _php3_hash_destroy(&ht_socks); @@ -451,7 +452,7 @@ /* }}} */ /* {{{ php3_rshutdown_fsock() */ -static int php3_rshutdown_fsock(void) +static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS) { struct php3i_sockbuf *sockbuf = phpsockbuf, *this; Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.1 php4/ext/standard/fsock.h:1.2 --- php4/ext/standard/fsock.h:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/fsock.h Sun Apr 18 11:58:26 1999 @@ -27,12 +27,22 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: fsock.h,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ #ifndef _FSOCK_H #define _FSOCK_H +#if WIN32|WINNT +# ifndef WINNT +# define WINNT 1 +# endif +#undef FD_SETSIZE +#include "arpa/inet.h" +#endif + +#if HAVE_NETINET_IN_H #include <netinet/in.h> +#endif extern php3_module_entry fsock_module_entry; #define fsock_module_ptr &fsock_module_entry Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.2 php4/ext/standard/info.c:1.3 --- php4/ext/standard/info.c:1.2 Fri Apr 16 21:52:58 1999 +++ php4/ext/standard/info.c Sun Apr 18 11:58:26 1999 @@ -33,7 +33,7 @@ #include "php.h" #include "php_ini.h" #include "php_globals.h" -#include "head.h" +#include "functions/head.h" #include "info.h" #ifndef MSVC5 #include "build-defs.h" @@ -108,7 +108,7 @@ PUTS("<img src=\""); - PUTS(GLOBAL(php3_rqst)->uri); + /*PUTS(GLOBAL(php3_rqst)->uri);*/ PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"56\" align=\"right\">\n"); php3_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION); PUTS("<p>by <a href=\"mailto:rasmus@lerdorf.on.ca\">Rasmus Lerdorf</a>,\n"); @@ -387,7 +387,7 @@ PUTS("<table width=\"100%%\"><tr>\n"); php3_printf("<td><h2>Zend</h2>This program makes use of the Zend scripting language engine:<br><pre>%s</pre></td>", get_zend_version()); PUTS("<td width=\"100\"><a href=\"http://www.zend.com/\"><img src=\""); - PUTS(GLOBAL(php3_rqst)->uri); + /*PUTS(GLOBAL(php3_rqst)->uri);*/ PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"89\"></a></td>\n"); PUTS("</tr></table>\n"); Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.1 php4/ext/standard/pack.c:1.2 --- php4/ext/standard/pack.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/pack.c Sun Apr 18 11:58:27 1999 @@ -26,7 +26,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: pack.c,v 1.2 1999/04/18 15:58:27 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -46,7 +46,7 @@ #else #include <sys/param.h> #endif -#include "head.h" +#include "functions/head.h" #include "safe_mode.h" #include "php3_string.h" #include "pack.h" Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.1 php4/ext/standard/string.c:1.2 --- php4/ext/standard/string.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/string.c Sun Apr 18 11:58:27 1999 @@ -30,14 +30,14 @@ */ -/* $Id: string.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: string.c,v 1.2 1999/04/18 15:58:27 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif #include <stdio.h> #include "php.h" #include "reg.h" -#include "post.h" +#include "functions/post.h" #include "php3_string.h" #if HAVE_SETLOCALE #include <locale.h> Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.1 php4/ext/standard/var.c:1.2 --- php4/ext/standard/var.c:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/var.c Sun Apr 18 11:58:27 1999 @@ -36,7 +36,7 @@ #include "php.h" #include "fopen-wrappers.h" #include "reg.h" -#include "post.h" +#include "functions/post.h" #include "php3_string.h" #if HAVE_SETLOCALE #include <locale.h> -- PHP 4 Beta