[PHP-CVS-DAILY] cvs: Zend / ChangeLog
changelog Mon Sep 9 20:33:26 2002 EDT Modified files: /Zend ChangeLog Log: ChangeLog update Index: Zend/ChangeLog diff -u Zend/ChangeLog:1.72 Zend/ChangeLog:1.73 --- Zend/ChangeLog:1.72 Sat Sep 7 20:34:14 2002 +++ Zend/ChangeLog Mon Sep 9 20:33:26 2002 @@ -1,3 +1,16 @@ +2002-09-09 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_execute.c: fix bug #18610 + +* zend_variables.c: +take care of right IS_CONSTANT_INDEX variables destruction +fixes bug #18108 + +* zend_execute_API.c: fix bug #18668 - arrays with constant indexes + +* zend_execute_API.c: protect EG(uninitialized_zval) from being referenced +this should fix bug #14582 + 2002-09-07 Thies C. Arntzen [EMAIL PROTECTED] * zend_execute_API.c: @@ -365,7 +378,7 @@ 2002-05-13 Sterling Hughes [EMAIL PROTECTED] -* zend_qsort.c: add $Id: ChangeLog,v 1.72 2002/09/08 00:34:14 changelog Exp $ tag +* zend_qsort.c: add $Id: ChangeLog,v 1.73 2002/09/10 00:33:26 changelog Exp $ tag 2002-05-13 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Mon Sep 9 20:34:15 2002 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1120 php4/NEWS:1.1121 --- php4/NEWS:1.1120Mon Sep 9 18:28:16 2002 +++ php4/NEWS Mon Sep 9 20:34:15 2002 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ? ? ??? 2002, Version 4.3.0 +- Added ability to extract() variables as references via OR'able EXTR_REFS + flag. (Andrei) - Fixed a build failure with the OCI8 extension on Tru64. (Patch by Michael Mauch, [EMAIL PROTECTED]) - Added support for fopen(ftps://..., ...) which allows to connect to FTP
[PHP-CVS] cvs: php4 / CODING_STANDARDS
derick Mon Sep 9 03:54:12 2002 EDT
Modified files:
/php4 CODING_STANDARDS
Log:
- spaces instead of tabs
Index: php4/CODING_STANDARDS
diff -u php4/CODING_STANDARDS:1.21 php4/CODING_STANDARDS:1.22
--- php4/CODING_STANDARDS:1.21 Mon Sep 9 03:52:39 2002
+++ php4/CODING_STANDARDS Mon Sep 9 03:54:11 2002
-97,9 +97,9
try avoiding it.
[7] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
- part of the source. Although the PHP_* macro's are mostly aliased to the
- ZEND_* macros it gives a better understanding on what kind of macro you're
- calling.
+part of the source. Although the PHP_* macro's are mostly aliased to the
+ZEND_* macros it gives a better understanding on what kind of macro you're
+calling.
[8] Use assert(). assert.h is included in php.h if it is available. Not only
does good assertion catch bugs, but it also helps with code readability.
-200,13 +200,13
[3] Be generous with whitespace and braces. Always prefer:
- if (foo) {
- bar;
- }
+if (foo) {
+bar;
+}
- to:
+to:
- if(foo)bar;
+if(foo)bar;
Keep one empty line between the variable declaration section and
the statements in a block, as well as between logical statement
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c
hyanantha Mon Sep 9 06:12:44 2002 EDT Modified files: /php4/ext/standard basic_functions.c Log: NetWare related changes/modifications Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.502 php4/ext/standard/basic_functions.c:1.503 --- php4/ext/standard/basic_functions.c:1.502 Sun Sep 8 12:45:28 2002 +++ php4/ext/standard/basic_functions.c Mon Sep 9 06:12:44 2002 -17,7 +17,7 +--+ */ -/* $Id: basic_functions.c,v 1.502 2002/09/08 16:45:28 sesser Exp $ */ +/* $Id: basic_functions.c,v 1.503 2002/09/09 10:12:44 hyanantha Exp $ */ #include php.h #include php_streams.h -456,7 +456,6 PHP_FE(cosh, NULL) PHP_FE(tanh, NULL) -/*#ifndef PHP_WIN32*/ #if !defined(PHP_WIN32) !defined(NETWARE) PHP_FE(asinh, NULL) PHP_FE(acosh, NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main main.c
hyanantha Mon Sep 9 07:15:48 2002 EDT
Modified files:
/php4/main main.c
Log:
NetWare related changes/modifications
Index: php4/main/main.c
diff -u php4/main/main.c:1.484 php4/main/main.c:1.485
--- php4/main/main.c:1.484 Sun Sep 1 07:33:19 2002
+++ php4/main/main.cMon Sep 9 07:15:47 2002
-18,7 +18,7
+--+
*/
-/* $Id: main.c,v 1.484 2002/09/01 11:33:19 sebastian Exp $ */
+/* $Id: main.c,v 1.485 2002/09/09 11:15:47 hyanantha Exp $ */
/* {{{ includes
*/
-28,6 +28,18
#include win32/time.h
#include win32/signal.h
#include process.h
+#elif defined(NETWARE)
+#ifdef NEW_LIBC
+#include sys/timeval.h
+#else
+#include netware/time_nw.h
+#endif
+/*#include netware/signal_nw.h*/
+/*#include netware/env.h*//* Temporary */
+/*#include process.h*/
+#ifdef USE_WINSOCK
+#include novsock2.h
+#endif
#else
#include build-defs.h
#endif
-968,7 +980,7
php_core_globals *core_globals;
sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id);
#endif
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) defined(USE_WINSOCK))
WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData;
#endif
-1034,7 +1046,7
setlocale(LC_CTYPE, );
#endif
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) defined(USE_WINSOCK))
/* start up winsock services */
if (WSAStartup(wVersionRequested, wsaData) != 0) {
php_printf(\nwinsock.dll unusable. %d\n, WSAGetLastError());
-1155,7 +1167,7
return;
}
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || (defined(NETWARE) defined(USE_WINSOCK))
/*close winsock */
WSACleanup();
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main mergesort.c
hyanantha Mon Sep 9 07:17:40 2002 EDT Modified files: /php4/main mergesort.c Log: NetWare related changes/modifications Index: php4/main/mergesort.c diff -u php4/main/mergesort.c:1.11 php4/main/mergesort.c:1.12 --- php4/main/mergesort.c:1.11 Mon Sep 17 17:02:53 2001 +++ php4/main/mergesort.c Mon Sep 9 07:17:40 2002 -64,6 +64,11 #include winsock.h /* Includes definition for u_char */ #endif +#if defined(NETWARE) !defined(NEW_LIBC) +/*#include ws2nlm.h*/ +#include sys/socket.h +#endif + static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /main php_ini.c
On Mon, Sep 09, 2002 at 11:43:51AM -, Anantha Kesari H Y wrote: hyanantha Mon Sep 9 07:43:51 2002 EDT Modified files: /php4/mainphp_ini.c Log: NetWare related changes/modifications Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.99 php4/main/php_ini.c:1.100 --- php4/main/php_ini.c:1.99 Thu Aug 29 06:24:02 2002 +++ php4/main/php_ini.c Mon Sep 9 07:43:50 2002 -16,13 +16,13 +--+ */ -/* $Id: php_ini.c,v 1.99 2002/08/29 10:24:02 jan Exp $ */ +/* $Id: php_ini.c,v 1.100 2002/09/09 11:43:50 hyanantha Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD #include php.h -#ifndef PHP_WIN32 +#if !defined(PHP_WIN32) !defined(NETWARE) #include build-defs.h shouln't we just add a define HAVE_BUILD_DEFS to php_config.h so that other platforms, which don't have it can be added easier? re, tc #endif #include ext/standard/info.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Thies C. Arntzen - Looking for all sorts of freelance work - just ask.. Whishlist: http://www.amazon.de/exec/obidos/wishlist/AB9DY62QWDSZ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
sterlingMon Sep 9 12:02:13 2002 EDT
Modified files:
/CVSROOTloginfo
Log:
send adt commit messages to [EMAIL PROTECTED]
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.78 CVSROOT/loginfo:1.79
--- CVSROOT/loginfo:1.78Mon Aug 19 13:59:47 2002
+++ CVSROOT/loginfo Mon Sep 9 12:02:12 2002
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.78 2002/08/19 17:59:47 jimw Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.79 2002/09/09 16:02:12 sterling
+Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -89,7 +89,7 @@
^php-lang$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^php-bugs-web $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
-^adt /home/sterling/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED] $USER %{sVv}
+^adt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# Smarty stuff
^smarty-web$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard parsedate.y
On Mon, 9 Sep 2002, Wez Furlong wrote: wez Mon Sep 9 15:09:24 2002 EDT Modified files: /php4/ext/standardparsedate.y Log: Revert Dericks accidental commit :-) Add an Id tag so we can see at a glance who is to blame. oops :) Derick --- Did I help you? http://www.derickrethans.nl/link.php?url=giftlist Frequent ranting: http://www.derickrethans.nl/ --- PHP: Scripting the Web - [EMAIL PROTECTED] All your branches are belong to me! SRM: Script Running Machine - www.vl-srm.net --- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_2_0) /ext/imap php_imap.c
kalowskyMon Sep 9 16:59:17 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/imap php_imap.c
Log:
Now this is correct for bug #15630
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.112.2.6 php4/ext/imap/php_imap.c:1.112.2.7
--- php4/ext/imap/php_imap.c:1.112.2.6 Mon Sep 9 16:54:01 2002
+++ php4/ext/imap/php_imap.cMon Sep 9 16:59:17 2002
@@ -25,7 +25,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.112.2.6 2002/09/09 20:54:01 kalowsky Exp $ */
+/* $Id: php_imap.c,v 1.112.2.7 2002/09/09 20:59:17 kalowsky Exp $ */
#define IMAP41
@@ -2200,7 +2200,7 @@
/* author: Andrew Skalski [EMAIL PROTECTED] */
zval **arg;
const unsigned char *in, *inp, *endp;
- unsigned char *out, *outp;
+ unsigned char *out, *outp, c;
int inlen, outlen;
enum {
ST_NORMAL, /* printable text */
@@ -2302,13 +2302,15 @@
break;
case ST_DECODE1:
outp[1] = UNB64(*inp);
- *outp++ |= outp[1] 4;
+ c = outp[1] 4;
+ *outp++ |= c;
*outp = 4;
state = ST_DECODE2;
break;
case ST_DECODE2:
outp[1] = UNB64(*inp);
- *outp++ |= outp[1] 2;
+ c = outpp[1] 2;
+ *outp++ |= c;
*outp = 6;
state = ST_DECODE3;
break;
@@ -2341,7 +2343,7 @@
/* author: Andrew Skalski [EMAIL PROTECTED] */
zval **arg;
const unsigned char *in, *inp, *endp;
- unsigned char *out, *outp;
+ unsigned char *out, *outp, c;
int inlen, outlen;
enum {
ST_NORMAL, /* printable text */
@@ -2412,7 +2414,8 @@
} else if (inp == endp || !SPECIAL(*inp)) {
/* flush overflow and terminate region */
if (state != ST_ENCODE0) {
- *outp++ = B64(*outp);
+ c = B64(*outp);
+ *outp++ = c;
}
*outp++ = '-';
state = ST_NORMAL;
@@ -2425,12 +2428,14 @@
state = ST_ENCODE1;
break;
case ST_ENCODE1:
- *outp++ = B64(*outp | *inp 4);
+ c = B64(*outp | *inp 4);
+ *outp++ = c;
*outp = *inp++ 2;
state = ST_ENCODE2;
break;
case ST_ENCODE2:
- *outp++ = B64(*outp | *inp 6);
+ c = B64(*outp | *inp 6);
+ *outp++ = c;
*outp++ = B64(*inp++);
state = ST_ENCODE0;
case ST_NORMAL:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
