Re: [PHP-CVS] cvs: php-src /ext/date config.m4
Enabled without asking, eh? Edin - Original Message - From: "Jani Taskinen" <[EMAIL PROTECTED]> To: Sent: Wednesday, June 15, 2005 12:50 AM Subject: [PHP-CVS] cvs: php-src /ext/date config.m4 > sniper Tue Jun 14 18:50:55 2005 EDT > > Modified files: > /php-src/ext/date config.m4 > Log: > fix VPATH builds + nuked unnecessary lines > > http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.1&r2=1.2&ty=u > Index: php-src/ext/date/config.m4 > diff -u php-src/ext/date/config.m4:1.1 php-src/ext/date/config.m4:1.2 > --- php-src/ext/date/config.m4:1.1 Tue Jun 14 17:32:27 2005 > +++ php-src/ext/date/config.m4 Tue Jun 14 18:50:55 2005 > @@ -1,6 +1,5 @@ > -dnl $Id: config.m4,v 1.1 2005/06/14 21:32:27 derick Exp $ > +dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $ > dnl config.m4 for date extension > > -AC_DEFINE(HAVE_DATE, 1, [Whether you want date/time support]) > -AC_DEFINE(TIMEZONE_DB_PATH, $libdir/timezonedb, [The path to the timezone database]) > -PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c, no) > +PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) > +PHP_ADD_BUILD_DIR([$ext_builddir/lib]) > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
edink Tue Jun 14 20:23:14 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Export symbols
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.3 php-src/ext/date/php_date.c:1.4
--- php-src/ext/date/php_date.c:1.3 Tue Jun 14 20:11:28 2005
+++ php-src/ext/date/php_date.c Tue Jun 14 20:23:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.3 2005/06/15 00:11:28 edink Exp $ */
+/* $Id: php_date.c,v 1.4 2005/06/15 00:23:14 edink Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -34,6 +34,10 @@
{NULL, NULL, NULL}
};
+#ifdef COMPILE_DL_DATE
+ZEND_GET_MODULE(date)
+#endif
+
PHP_INI_BEGIN()
/* STD_PHP_INI_ENTRY("date.timezone", TIMEZONE_DB_LOCATION, PHP_INI_ALL,
OnUpdateString, timezonedb_location, zend_date_globals, date_globals) */
PHP_INI_END()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c
edink Tue Jun 14 20:17:41 2005 EDT
Modified files:
/php-src/ext/date/lib parse_date.c
Log:
Touch + manual fix for re2c bug where it forgets {} in static int scan()
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.1
php-src/ext/date/lib/parse_date.c:1.2
--- php-src/ext/date/lib/parse_date.c:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/parse_date.c Tue Jun 14 20:17:41 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.7.dev on Tue Jun 14 22:27:50 2005 */
+/* Generated by re2c 0.9.7 on Wed Jun 15 02:15:30 2005 */
#line 1 "parse_date.re"
/*
+--+
@@ -18,13 +18,18 @@
+--+
*/
-/* $Id: parse_date.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: parse_date.c,v 1.2 2005/06/15 00:17:41 edink Exp $ */
#include
#include
#include
#include "datetime.h"
+#ifdef PHP_WIN32
+#define strcasecmp stricmp
+#define strtoll(s, f, b) _atoi64(s)
+#endif
+
#define TIMELIB_SECOND 1
#define TIMELIB_MINUTE 2
#define TIMELIB_HOUR3
@@ -115,14 +120,14 @@
#include "timelib_structs.h"
typedef struct timelib_elems {
- uint c; /* Number of elements */
+ unsigned int c; /* Number of elements */
char **v; /* Values */
} timelib_elems;
typedef struct Scanner {
intfd;
uchar *lim, *str, *ptr, *cur, *tok, *pos;
- uint line, len;
+ unsigned int line, len;
struct timelib_time *time;
} Scanner;
@@ -367,7 +372,7 @@
#if 0
uchar *fill(Scanner *s, uchar *cursor){
if(!s->eof){
- uint cnt = s->tok - s->bot;
+ unsigned int cnt = s->tok - s->bot;
if(cnt){
memcpy(s->bot, s->tok, s->lim - s->tok);
s->tok = s->bot;
@@ -736,8 +741,8 @@
std:
s->tok = cursor;
s->len = 0;
-#line 839 "parse_date.re"
-
+#line 844 "parse_date.re"
+{
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
@@ -774,7 +779,7 @@
0, 0, 0, 0, 0, 0, 0, 0,
};
-#line 778 ""
+#line 40 ""
{
YYCTYPE yych;
unsigned int yyaccept;
@@ -852,14 +857,14 @@
yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1257 "parse_date.re"
+#line 1262 "parse_date.re"
{
TIMELIB_INIT;
s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst,
s->time);
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 856 ""
+#line 118 ""
yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -928,12 +933,12 @@
yy7:
YYDEBUG(7, *YYCURSOR);
-#line 1317 "parse_date.re"
+#line 1322 "parse_date.re"
{
printf("unexpected character: #%d, %c\n", *s->tok, *s->tok);
goto std;
}
-#line 922 ""
+#line 184 ""
yy8:
YYDEBUG(8, *YYCURSOR);
yyaccept = 0;
@@ -1667,11 +1672,11 @@
yy44:
YYDEBUG(44, *YYCURSOR);
-#line 1306 "parse_date.re"
+#line 1311 "parse_date.re"
{
goto std;
}
-#line 1581 ""
+#line 843 ""
yy45:
YYDEBUG(45, *YYCURSOR);
++YYCURSOR;
@@ -1679,12 +1684,12 @@
yy46:
YYDEBUG(46, *YYCURSOR);
-#line 1311 "parse_date.re"
+#line 1316 "parse_date.re"
{
s->pos = cursor; s->line++;
goto std;
}
-#line 1590 ""
+#line 852 ""
yy47:
YYDEBUG(47, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2037,7 +2042,7 @@
yy81:
YYDEBUG(81, *YYCURSOR);
-#line 1290 "parse_date.re"
+#line 1295 "parse_date.re"
{
timelib_ull i;
@@ -2052,7 +2057,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 1887 ""
+#line 1149 ""
yy82:
YYDEBUG(82, *YYCURSOR);
++YYCURSOR;
@@ -2675,11 +2680,11 @@
yy148:
YYDEBUG(148, *YYCURSOR);
-#line 1252 "parse_date.re"
+#line 1257 "parse_date.re"
{
goto std;
}
-#line 2380 ""
+#line 1642 ""
yy149:
YYDEBUG(149, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2721,7 +2726,7 @@
yy155:
YYDEBUG(155, *YYCURSOR);
-#line 1236 "parse_date.re"
+#line 1241 "parse_date.re"
{
const timelib_relunit* relunit;
@@ -2736,7 +2741,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2423 ""
+#line 1685 ""
yy156:
YYDEBUG(156, *YYCURSOR);
yyaccept = 1;
@@ -3120,7 +3125,7 @@
yy188:
YYDEBUG(188, *YYCURSOR);
-#line 1220 "parse_date.re"
+#line 1225 "parse_date.re"
{
long i;
@@ -3135,7 +3140,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2754 ""
+#line 2016 ""
yy189:
YYDEBUG(189, *YYCURSOR);
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib datetime.h parse_tz.c timelib_structs.h tm2unixtime.c unixtime2tm.c /ext/date/lib/resource parse_date.re
edink Tue Jun 14 20:11:29 2005 EDT
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib datetime.h parse_tz.c timelib_structs.h
tm2unixtime.c unixtime2tm.c
/php-src/ext/date/lib/resource parse_date.re
Log:
Make it compile on windows
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.2 php-src/ext/date/php_date.c:1.3
--- php-src/ext/date/php_date.c:1.2 Tue Jun 14 19:40:56 2005
+++ php-src/ext/date/php_date.c Tue Jun 14 20:11:28 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.2 2005/06/14 23:40:56 iliaa Exp $ */
+/* $Id: php_date.c,v 1.3 2005/06/15 00:11:28 edink Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -126,7 +126,7 @@
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, "s", ×, &time_len) != FAILURE) {
/* We have no initial timestamp */
now = timelib_time_ctor();
- timelib_unixtime2local(now, (signed long long) time(NULL), tzi);
+ timelib_unixtime2local(now, (timelib_sll) time(NULL), tzi);
} else {
timelib_tzinfo_ctor(tzi);
RETURN_FALSE;
http://cvs.php.net/diff.php/php-src/ext/date/lib/datetime.h?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/datetime.h
diff -u php-src/ext/date/lib/datetime.h:1.1 php-src/ext/date/lib/datetime.h:1.2
--- php-src/ext/date/lib/datetime.h:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/datetime.h Tue Jun 14 20:11:29 2005
@@ -16,13 +16,22 @@
+--+
*/
-/* $Id: datetime.h,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: datetime.h,v 1.2 2005/06/15 00:11:29 edink Exp $ */
#include "timelib_structs.h"
#define TIMELIB_NONE 0x00
#define TIMELIB_OVERRIDE_TIME0x01
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647L
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN (- LONG_MAX - 1)
+#endif
+
+
/* From dow.c */
int timelib_day_of_week(int y, int m, int d);
int timelib_daynr_from_weeknr(int y, int w, int d);
@@ -35,7 +44,7 @@
void timelib_update_ts(timelib_time* time, timelib_tzinfo* tzi);
/* From unixtime2tm.c */
-int timelib_apply_localtime(timelib_time *t, uint localtime);
+int timelib_apply_localtime(timelib_time *t, unsigned int localtime);
void timelib_unixtime2gmt(timelib_time* tm, timelib_sll ts);
void timelib_unixtime2local(timelib_time *tm, timelib_sll ts, timelib_tzinfo*
tz);
void timelib_set_timezone(timelib_time *t, timelib_tzinfo *tz);
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.1 php-src/ext/date/lib/parse_tz.c:1.2
--- php-src/ext/date/lib/parse_tz.c:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/parse_tz.c Tue Jun 14 20:11:29 2005
@@ -16,10 +16,14 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: parse_tz.c,v 1.2 2005/06/15 00:11:29 edink Exp $ */
#include
+#ifdef PHP_WIN32
+#include
+#else
#include
+#endif
#include
#include "datetime.h"
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib_structs.h?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/timelib_structs.h
diff -u php-src/ext/date/lib/timelib_structs.h:1.1
php-src/ext/date/lib/timelib_structs.h:1.2
--- php-src/ext/date/lib/timelib_structs.h:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/timelib_structs.h Tue Jun 14 20:11:29 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: timelib_structs.h,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: timelib_structs.h,v 1.2 2005/06/15 00:11:29 edink Exp $ */
#ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__
@@ -24,9 +24,13 @@
#include
#include
#include
+#ifdef PHP_WIN32
+#include
+#else
#include
+#endif
-#if defined(WIN32) && _MSC_VER < 1300
+#if defined(PHP_WIN32) && _MSC_VER < 1300
typedef unsigned __int64 timelib_ull;
typedef __int64 timelib_sll;
#else
@@ -34,6 +38,11 @@
typedef signed long long timelib_sll;
#endif
+#if defined(_MSC_VER)
+#define int32_t __int32
+#define uint32_t unsigned __int32
+#endif
+
typedef struct ttinfo
{
int32_t offset;
@@ -78,8 +87,8 @@
typedef struct timelib_time_offset {
int32_t offset;
- uint leap_secs;
- uint is_dst;
+ unsigned int leap_secs;
+ unsigned int is_dst;
char *abbr;
} timelib_time_offset;
@@ -90,17 +99,17 @@
int z; /* GMT offset in minutes */
char *tz_abbr; /* Timezone abbreviation (display only) */
timelib_tzinfo *tz
Re: [PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib datetime.c
Hello Everyone,
This extensions conflicts with pecl/date. Two extensions with the same
name makes it impossible to build any of these. Any resolutions for this?
- Frank
> iliaa Tue Jun 14 19:40:57 2005 EDT
>
> Modified files:
> /php-src/ext/date php_date.c
> /php-src/ext/date/lib datetime.c
> Log:
> Fixed memory leaks.
>
>
>
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.1&r2=1.2&ty=u
> Index: php-src/ext/date/php_date.c
> diff -u php-src/ext/date/php_date.c:1.1 php-src/ext/date/php_date.c:1.2
> --- php-src/ext/date/php_date.c:1.1 Tue Jun 14 17:32:27 2005
> +++ php-src/ext/date/php_date.c Tue Jun 14 19:40:56 2005
> @@ -16,7 +16,7 @@
>
+--+
> */
>
> -/* $Id: php_date.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
> +/* $Id: php_date.c,v 1.2 2005/06/14 23:40:56 iliaa Exp $ */
>
> #include "php.h"
> #include "php_streams.h"
> @@ -128,6 +128,7 @@
> now = timelib_time_ctor();
> timelib_unixtime2local(now, (signed long long) time(NULL), tzi);
> } else {
> + timelib_tzinfo_ctor(tzi);
> RETURN_FALSE;
> }
>
> @@ -135,6 +136,16 @@
> timelib_fill_holes(t, now, 0);
> timelib_update_ts(t, tzi);
> ts = timelib_date_to_int(t, &error);
> +
> + /* if tz_info is not a copy, avoid double free */
> + if (now->tz_info == tzi) {
> + now->tz_info = NULL;
> + }
> +
> + timelib_time_dtor(now);
> + timelib_time_dtor(t);
> + timelib_tzinfo_dtor(tzi);
> +
> if (error) {
> RETURN_FALSE;
> } else {
>
http://cvs.php.net/diff.php/php-src/ext/date/lib/datetime.c?r1=1.1&r2=1.2&ty=u
> Index: php-src/ext/date/lib/datetime.c
> diff -u php-src/ext/date/lib/datetime.c:1.1
php-src/ext/date/lib/datetime.c:1.2
> --- php-src/ext/date/lib/datetime.c:1.1 Tue Jun 14 17:32:27 2005
> +++ php-src/ext/date/lib/datetime.c Tue Jun 14 19:40:57 2005
> @@ -16,12 +16,18 @@
>
+--+
> */
>
> -/* $Id: datetime.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
> +/* $Id: datetime.c,v 1.2 2005/06/14 23:40:57 iliaa Exp $ */
>
> #include "timelib_structs.h"
> #include "datetime.h"
> #include
>
> +#define PHP_TIME_FREE(m) + if (m) {+
> free(m);+ m = NULL; + }
> +
> timelib_time* timelib_time_ctor()
> {
> timelib_time *t;
> @@ -33,10 +39,8 @@
> void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr)
> {
> int i;
> -
> - if (tm->tz_abbr) {
> - free(tm->tz_abbr);
> - }
> +
> + PHP_TIME_FREE(tm->tz_abbr);
> tm->tz_abbr = strdup(tz_abbr);
> for (i = 0; i < strlen(tz_abbr); i++) {
> tm->tz_abbr[i] = toupper(tz_abbr[i]);
> @@ -45,10 +49,12 @@
>
> void timelib_time_dtor(timelib_time* t)
> {
> - if (t->tz_abbr) {
> - free(t->tz_abbr);
> + PHP_TIME_FREE(t->tz_abbr);
> + if (t->tz_info) {
> + timelib_tzinfo_dtor(t->tz_info);
> + t->tz_info = NULL;
> }
> - free(t);
> + PHP_TIME_FREE(t);
> }
>
> timelib_time_offset* timelib_time_offset_ctor()
> @@ -61,10 +67,8 @@
>
> void timelib_time_offset_dtor(timelib_time_offset* t)
> {
> - if (t->abbr) {
> - free(t->abbr);
> - }
> - free(t);
> + PHP_TIME_FREE(t->abbr);
> + PHP_TIME_FREE(t);
> }
>
> timelib_tzinfo* timelib_tzinfo_ctor(char *name)
> @@ -105,13 +109,13 @@
>
> void timelib_tzinfo_dtor(timelib_tzinfo *tz)
> {
> - free(tz->name);
> - free(tz->trans);
> - free(tz->trans_idx);
> - free(tz->type);
> - free(tz->timezone_abbr);
> - free(tz->leap_times);
> - free(tz);
> + PHP_TIME_FREE(tz->name);
> + PHP_TIME_FREE(tz->trans);
> + PHP_TIME_FREE(tz->trans_idx);
> + PHP_TIME_FREE(tz->type);
> + PHP_TIME_FREE(tz->timezone_abbr);
> + PHP_TIME_FREE(tz->leap_times);
> + PHP_TIME_FREE(tz);
> }
>
> char *timelib_get_tz_abbr_ptr(timelib_time *t)
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib datetime.c
iliaa Tue Jun 14 19:40:57 2005 EDT
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib datetime.c
Log:
Fixed memory leaks.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.1 php-src/ext/date/php_date.c:1.2
--- php-src/ext/date/php_date.c:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/php_date.c Tue Jun 14 19:40:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: php_date.c,v 1.2 2005/06/14 23:40:56 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -128,6 +128,7 @@
now = timelib_time_ctor();
timelib_unixtime2local(now, (signed long long) time(NULL), tzi);
} else {
+ timelib_tzinfo_ctor(tzi);
RETURN_FALSE;
}
@@ -135,6 +136,16 @@
timelib_fill_holes(t, now, 0);
timelib_update_ts(t, tzi);
ts = timelib_date_to_int(t, &error);
+
+ /* if tz_info is not a copy, avoid double free */
+ if (now->tz_info == tzi) {
+ now->tz_info = NULL;
+ }
+
+ timelib_time_dtor(now);
+ timelib_time_dtor(t);
+ timelib_tzinfo_dtor(tzi);
+
if (error) {
RETURN_FALSE;
} else {
http://cvs.php.net/diff.php/php-src/ext/date/lib/datetime.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/datetime.c
diff -u php-src/ext/date/lib/datetime.c:1.1 php-src/ext/date/lib/datetime.c:1.2
--- php-src/ext/date/lib/datetime.c:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/datetime.c Tue Jun 14 19:40:57 2005
@@ -16,12 +16,18 @@
+--+
*/
-/* $Id: datetime.c,v 1.1 2005/06/14 21:32:27 derick Exp $ */
+/* $Id: datetime.c,v 1.2 2005/06/14 23:40:57 iliaa Exp $ */
#include "timelib_structs.h"
#include "datetime.h"
#include
+#define PHP_TIME_FREE(m) \
+ if (m) {\
+ free(m);\
+ m = NULL; \
+ } \
+
timelib_time* timelib_time_ctor()
{
timelib_time *t;
@@ -33,10 +39,8 @@
void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr)
{
int i;
-
- if (tm->tz_abbr) {
- free(tm->tz_abbr);
- }
+
+ PHP_TIME_FREE(tm->tz_abbr);
tm->tz_abbr = strdup(tz_abbr);
for (i = 0; i < strlen(tz_abbr); i++) {
tm->tz_abbr[i] = toupper(tz_abbr[i]);
@@ -45,10 +49,12 @@
void timelib_time_dtor(timelib_time* t)
{
- if (t->tz_abbr) {
- free(t->tz_abbr);
+ PHP_TIME_FREE(t->tz_abbr);
+ if (t->tz_info) {
+ timelib_tzinfo_dtor(t->tz_info);
+ t->tz_info = NULL;
}
- free(t);
+ PHP_TIME_FREE(t);
}
timelib_time_offset* timelib_time_offset_ctor()
@@ -61,10 +67,8 @@
void timelib_time_offset_dtor(timelib_time_offset* t)
{
- if (t->abbr) {
- free(t->abbr);
- }
- free(t);
+ PHP_TIME_FREE(t->abbr);
+ PHP_TIME_FREE(t);
}
timelib_tzinfo* timelib_tzinfo_ctor(char *name)
@@ -105,13 +109,13 @@
void timelib_tzinfo_dtor(timelib_tzinfo *tz)
{
- free(tz->name);
- free(tz->trans);
- free(tz->trans_idx);
- free(tz->type);
- free(tz->timezone_abbr);
- free(tz->leap_times);
- free(tz);
+ PHP_TIME_FREE(tz->name);
+ PHP_TIME_FREE(tz->trans);
+ PHP_TIME_FREE(tz->trans_idx);
+ PHP_TIME_FREE(tz->type);
+ PHP_TIME_FREE(tz->timezone_abbr);
+ PHP_TIME_FREE(tz->leap_times);
+ PHP_TIME_FREE(tz);
}
char *timelib_get_tz_abbr_ptr(timelib_time *t)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Tue Jun 14 18:50:55 2005 EDT Modified files: /php-src/ext/date config.m4 Log: fix VPATH builds + nuked unnecessary lines http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.1&r2=1.2&ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.1 php-src/ext/date/config.m4:1.2 --- php-src/ext/date/config.m4:1.1 Tue Jun 14 17:32:27 2005 +++ php-src/ext/date/config.m4 Tue Jun 14 18:50:55 2005 @@ -1,6 +1,5 @@ -dnl $Id: config.m4,v 1.1 2005/06/14 21:32:27 derick Exp $ +dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $ dnl config.m4 for date extension -AC_DEFINE(HAVE_DATE, 1, [Whether you want date/time support]) -AC_DEFINE(TIMEZONE_DB_PATH, $libdir/timezonedb, [The path to the timezone database]) -PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c, no) +PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.w32
edink Tue Jun 14 18:25:50 2005 EDT
Added files:
/php-src/ext/date config.w32
Log:
Added win32 build file
http://cvs.php.net/co.php/php-src/ext/date/config.w32?r=1.1&p=1
Index: php-src/ext/date/config.w32
+++ php-src/ext/date/config.w32
// $Id: config.w32,v 1.1 2005/06/14 22:25:48 edink Exp $
// vim:ft=javascript
ARG_WITH("date", "Whether you want date/time support", "no");
if (PHP_DATE == "yes") {
EXTENSION("date", "php_date.c", PHP_DATE_SHARED, "-Iext/date/lib");
ADD_SOURCES("ext/date/lib", "datetime.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c", "date");
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug21800.phpt
sniper Tue Jun 14 18:21:08 2005 EDT Removed files: /php-src/tests/lang bug21800.phpt Log: This test did not fit to the new interactive shell thing -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Tue Jun 14 18:19:51 2005 EDT Modified files: /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1919&r2=1.1920&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1919 php-src/NEWS:1.1920 --- php-src/NEWS:1.1919 Tue Jun 14 17:32:24 2005 +++ php-src/NEWSTue Jun 14 18:19:50 2005 @@ -8,6 +8,7 @@ shutdown). (Wez) - Fixed PECL bug #3714 (beginTransaction doesn't work if you're in auto-commit mode). (Wez) +- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob) - Fixed bug #33312 (ReflectionParameter methods do not work correctly). (Dmitry) - Fixed bug #33212 ([GCC 4]: 'zend_error_noreturn' aliased to external symbol -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
rrichards Tue Jun 14 15:41:20 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.432&r2=1.1760.2.433&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.432 php-src/NEWS:1.1760.2.433 --- php-src/NEWS:1.1760.2.432 Thu Jun 9 13:13:36 2005 +++ php-src/NEWSTue Jun 14 15:41:16 2005 @@ -14,6 +14,7 @@ - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed memory corruption in stristr(). (Derick) - Fixed segfaults when CURL callback functions throw exception. (Tony) +- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob) - Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3 in length). (Ilia) - Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xsl xsltprocessor.c
rrichards Tue Jun 14 15:40:34 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xslxsltprocessor.c
Log:
MFH: Fixed bug #33340 (CLI Crash when calling php:function from XSLT)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.5&r2=1.29.2.6&ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.5
php-src/ext/xsl/xsltprocessor.c:1.29.2.6
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.5Mon Jan 17 11:01:35 2005
+++ php-src/ext/xsl/xsltprocessor.c Tue Jun 14 15:40:33 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.29.2.5 2005/01/17 16:01:35 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.6 2005/06/14 19:40:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -200,7 +200,7 @@
int j;
dom_object *domintern;
array_init(args[i]);
- if (obj->nodesetval->nodeNr > 0) {
+ if (obj->nodesetval &&
obj->nodesetval->nodeNr > 0) {
domintern = (dom_object *)
php_dom_object_get_data((void *) obj->nodesetval->nodeTab[0]->doc);
for (j = 0; j <
obj->nodesetval->nodeNr; j++) {
xmlNodePtr node =
obj->nodesetval->nodeTab[j];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
rrichards Tue Jun 14 15:39:53 2005 EDT
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
Fixed bug #33340 (CLI Crash when calling php:function from XSLT)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.37&r2=1.38&ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.37
php-src/ext/xsl/xsltprocessor.c:1.38
--- php-src/ext/xsl/xsltprocessor.c:1.37Wed Apr 6 08:26:29 2005
+++ php-src/ext/xsl/xsltprocessor.c Tue Jun 14 15:39:52 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.37 2005/04/06 12:26:29 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.38 2005/06/14 19:39:52 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -200,7 +200,7 @@
int j;
dom_object *domintern = (dom_object
*)intern->doc;
array_init(args[i]);
- if (obj->nodesetval->nodeNr > 0) {
+ if (obj->nodesetval &&
obj->nodesetval->nodeNr > 0) {
for (j = 0; j <
obj->nodesetval->nodeNr; j++) {
xmlNodePtr node =
obj->nodesetval->nodeTab[j];
zval *child;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main network.c
Thanks.
At 01:09 PM 6/14/2005 +, Ilia Alshanetsky wrote:
iliaa Tue Jun 14 09:09:07 2005 EDT
Modified files:
/php-src/main network.c
Log:
bzero > memset
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.115&r2=1.116&ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.115 php-src/main/network.c:1.116
--- php-src/main/network.c:1.115Mon Jun 13 22:39:42 2005
+++ php-src/main/network.c Tue Jun 14 09:09:04 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.115 2005/06/14 02:39:42 iliaa Exp $ */
+/* $Id: network.c,v 1.116 2005/06/14 13:09:04 iliaa Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -797,7 +797,7 @@
if (!inet_aton(bindto,
&in4->sin_addr)) {
goto bad_ip;
}
- bzero(&(in4->sin_zero), 8);
+ memset(&(in4->sin_zero), 0,
sizeof(in4->sin_zero));
}
#if HAVE_IPV6 && HAVE_INET_PTON
else { /* IPV6 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / acinclude.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4
I appreciate all your work here Jani, but this breaks PECL PDO against PHP 5.0, which is perhaps the main target for figuring out where the headers live. Is there any way to keep compat with 5.0? (I know you think it's pointless, but it's *very* important). --Wez. On 6/13/05, Jani Taskinen <[EMAIL PROTECTED]> wrote: > sniper Mon Jun 13 20:00:53 2005 EDT > > Modified files: > /php-srcacinclude.m4 > /php-src/ext/pdo_firebird config.m4 > /php-src/ext/pdo_mysql config.m4 > /php-src/ext/pdo_ociconfig.m4 > /php-src/ext/pdo_odbc config.m4 > /php-src/ext/pdo_pgsql config.m4 > /php-src/ext/pdo_sqlite config.m4 > Log: > - Added PHP_CHECK_PDO_INCLUDES macro (caches the result) > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Tue Jun 14 10:45:12 2005 EDT Modified files: /CVSROOTavail Log: proper path http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.986&r2=1.987&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.986 CVSROOT/avail:1.987 --- CVSROOT/avail:1.986 Sat Jun 11 09:59:39 2005 +++ CVSROOT/avail Tue Jun 14 10:45:11 2005 @@ -280,7 +280,7 @@ # legally encumbered. If you have contributions for these two extensions, # please contact the lead developers. This is a temporary measure until # we can put in place a more general process. -unavail||pecl/ibm_db2,pecl/pdo_odbc,ext/pdo_odbc +unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc avail|dbs,skoduru|pecl/ibm_db2 avail|wez,dbs|pecl/pdo_odbc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo .cvsignore /ext/pdo_firebird .cvsignore /ext/pdo_mysql .cvsignore /ext/pdo_oci .cvsignore /ext/pdo_odbc .cvsignore /ext/pdo_pgsql .cvsignore /ext/pdo_sqlite .cvsi
sniper Tue Jun 14 09:26:09 2005 EDT Added files: /php-src/ext/pdo_firebird .cvsignore Modified files: /php-src/ext/pdo_mysql .cvsignore /php-src/ext/pdo_oci.cvsignore /php-src/ext/pdo_odbc .cvsignore /php-src/ext/pdo_pgsql .cvsignore /php-src/ext/pdo_sqlite .cvsignore /php-src/ext/pdo.cvsignore Log: unify .cvsignore files http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/.cvsignore?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo_mysql/.cvsignore diff -u php-src/ext/pdo_mysql/.cvsignore:1.1 php-src/ext/pdo_mysql/.cvsignore:1.2 --- php-src/ext/pdo_mysql/.cvsignore:1.1Sun Sep 26 16:53:31 2004 +++ php-src/ext/pdo_mysql/.cvsignoreTue Jun 14 09:26:09 2005 @@ -1,7 +1,7 @@ .deps *.lo *.la -autom4te.cache +.*.swp .libs Makefile Makefile.fragments @@ -9,7 +9,9 @@ Makefile.objects acinclude.m4 aclocal.m4 +autom4te*.cache build +config.cache config.guess config.h config.h.in @@ -26,3 +28,4 @@ missing mkinstalldirs modules +conftest* http://cvs.php.net/diff.php/php-src/ext/pdo_oci/.cvsignore?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo_oci/.cvsignore diff -u php-src/ext/pdo_oci/.cvsignore:1.2 php-src/ext/pdo_oci/.cvsignore:1.3 --- php-src/ext/pdo_oci/.cvsignore:1.2 Mon May 17 14:17:39 2004 +++ php-src/ext/pdo_oci/.cvsignore Tue Jun 14 09:26:09 2005 @@ -9,8 +9,9 @@ Makefile.objects acinclude.m4 aclocal.m4 -autom4te-2.53.cache +autom4te*.cache build +config.cache config.guess config.h config.h.in @@ -27,3 +28,4 @@ missing mkinstalldirs modules +conftest* http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/.cvsignore?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo_odbc/.cvsignore diff -u php-src/ext/pdo_odbc/.cvsignore:1.2 php-src/ext/pdo_odbc/.cvsignore:1.3 --- php-src/ext/pdo_odbc/.cvsignore:1.2 Mon May 17 18:20:11 2004 +++ php-src/ext/pdo_odbc/.cvsignore Tue Jun 14 09:26:09 2005 @@ -9,8 +9,9 @@ Makefile.objects acinclude.m4 aclocal.m4 -autom4te-2.53.cache +autom4te*.cache build +config.cache config.guess config.h config.h.in @@ -27,3 +28,4 @@ missing mkinstalldirs modules +conftest* http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/.cvsignore?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo_pgsql/.cvsignore diff -u php-src/ext/pdo_pgsql/.cvsignore:1.1 php-src/ext/pdo_pgsql/.cvsignore:1.2 --- php-src/ext/pdo_pgsql/.cvsignore:1.1Wed May 19 22:27:49 2004 +++ php-src/ext/pdo_pgsql/.cvsignoreTue Jun 14 09:26:09 2005 @@ -1,31 +1,15 @@ -#*# -*.dsw -*.la -*.lo -*.ncb -*.opt -*.plg -*.tgz -*~ -.#* .deps +*.lo +*.la +.*.swp .libs -Debug -Debug_TS -Debug_TS_SSL Makefile Makefile.fragments Makefile.global Makefile.objects -Release -Release_TS -Release_TSDbg -Release_TS_SSL -Release_TS_inline -Release_inline acinclude.m4 aclocal.m4 -autom4te.cache +autom4te*.cache build config.cache config.guess @@ -37,8 +21,6 @@ config.sub configure configure.in -conftest -conftest.c include install-sh libtool @@ -46,4 +28,4 @@ missing mkinstalldirs modules -scan_makefile_in.awk +conftest* http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/.cvsignore?r1=1.3&r2=1.4&ty=u Index: php-src/ext/pdo_sqlite/.cvsignore diff -u php-src/ext/pdo_sqlite/.cvsignore:1.3 php-src/ext/pdo_sqlite/.cvsignore:1.4 --- php-src/ext/pdo_sqlite/.cvsignore:1.3 Fri May 6 22:51:52 2005 +++ php-src/ext/pdo_sqlite/.cvsignore Tue Jun 14 09:26:09 2005 @@ -1,7 +1,7 @@ .deps *.lo *.la -autom4te.cache +.*.swp .libs Makefile Makefile.fragments @@ -9,7 +9,9 @@ Makefile.objects acinclude.m4 aclocal.m4 +autom4te*.cache build +config.cache config.guess config.h config.h.in @@ -26,3 +28,4 @@ missing mkinstalldirs modules +conftest* http://cvs.php.net/diff.php/php-src/ext/pdo/.cvsignore?r1=1.3&r2=1.4&ty=u Index: php-src/ext/pdo/.cvsignore diff -u php-src/ext/pdo/.cvsignore:1.3 php-src/ext/pdo/.cvsignore:1.4 --- php-src/ext/pdo/.cvsignore:1.3 Tue Sep 28 05:44:56 2004 +++ php-src/ext/pdo/.cvsignore Tue Jun 14 09:26:09 2005 @@ -9,8 +9,9 @@ Makefile.objects acinclude.m4 aclocal.m4 -autom4te-2.53.cache +autom4te*.cache build +config.cache config.guess config.h config.h.in @@ -27,4 +28,4 @@ missing mkinstalldirs modules -autom4te.cache +conftest* http://cvs.php.net/co.php/php-src/ext/pdo_firebird/.cvsignore?r=1.1&p=1 Index: php-src/ext/pdo_firebird/.cvsignore +++ php-src/ext/pdo_firebird/.cvsignore..deps *.lo *.la..*.swp..libs Makefile Makefile.fragments Makefile.global Makefile.objects acinclude.m4 aclocal.m4 autom4te*.cache build config.cache config.guess config.h config.h.in config.log config.nice config.status config.sub configure configure.in include install-sh libtool ltmain.sh missing mkinstalldirs modules conftest* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo config.m4
sniper Tue Jun 14 09:09:24 2005 EDT Modified files: /php-src/ext/pdoconfig.m4 Log: If the macro exists, use it, otherwise use the Makefile.frag http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.14&r2=1.15&ty=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.14 php-src/ext/pdo/config.m4:1.15 --- php-src/ext/pdo/config.m4:1.14 Sun May 29 19:16:42 2005 +++ php-src/ext/pdo/config.m4 Tue Jun 14 09:09:23 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2005/05/29 23:16:42 sniper Exp $ +dnl $Id: config.m4,v 1.15 2005/06/14 13:09:23 sniper Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -52,9 +52,10 @@ fi PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) - dnl When we care only about PHP 5.1 and above, we'll do it this way - dnl PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h]) - - dnl But since that breaks everyone developing against a stable release, we'll do it this way - PHP_ADD_MAKEFILE_FRAGMENT + ifdef([PHP_INSTALL_HEADERS], + [ +PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h]) + ], [ +PHP_ADD_MAKEFILE_FRAGMENT + ]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
iliaa Tue Jun 14 09:09:07 2005 EDT
Modified files:
/php-src/main network.c
Log:
bzero > memset
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.115&r2=1.116&ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.115 php-src/main/network.c:1.116
--- php-src/main/network.c:1.115Mon Jun 13 22:39:42 2005
+++ php-src/main/network.c Tue Jun 14 09:09:04 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.115 2005/06/14 02:39:42 iliaa Exp $ */
+/* $Id: network.c,v 1.116 2005/06/14 13:09:04 iliaa Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -797,7 +797,7 @@
if (!inet_aton(bindto, &in4->sin_addr))
{
goto bad_ip;
}
- bzero(&(in4->sin_zero), 8);
+ memset(&(in4->sin_zero), 0,
sizeof(in4->sin_zero));
}
#if HAVE_IPV6 && HAVE_INET_PTON
else { /* IPV6 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
