date:20030208

[PHP-CVS-DAILY] cvs: php4 / ChangeLog

2003-02-08 Thread changelog

changelog   Sat Feb  8 20:31:24 2003 EDT

  Modified files:  
/php4   ChangeLog 
  Log:
  ChangeLog update
  
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.1260 php4/ChangeLog:1.1261
--- php4/ChangeLog:1.1260   Fri Feb  7 20:32:49 2003
+++ php4/ChangeLog  Sat Feb  8 20:31:24 2003
@@ -1,3 +1,42 @@
+2003-02-08  Sascha Schumann  [EMAIL PROTECTED]
+
+* ext/gettext/gettext.c:
+  Fix segfault in bindtextdomain when first parameter was empty.
+  
+  The Linux man page states: domainname must be a non-empty string.
+  
+  Noticed by: Nils Meyer
+
+2003-02-08  Marcus Boerger  [EMAIL PROTECTED]
+
+* sapi/cli/php.1:
+  Style corrections
+  See also: Stig's intro
+  Version info
+
+2003-02-08  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/standard/string.c:
+  style  ws fixes
+
+2003-02-08  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  ext/gd/libgd/gd.c
+  ext/gd/libgd/gd.h:
+  MFH:
+  Add gdImageEllipse
+  Replace gdImageFilledEllipse by a new function (backported from
+  the new phpgd)
+  the new gdImageFilledEllipse fix bug bug #22103 (ellipse part)
+
+* ext/gd/libgd/gd.c
+  ext/gd/libgd/gd.h:
+  Add gdImageEllipse
+  Replace gdImageFilledEllipse by a new function (backported from
+  the new phpgd)
+  the new gdImageFilledEllipse fix bug bug #22103 (ellipse part)
+
 2003-02-07  Sara Golemon  [EMAIL PROTECTED]
 
 * ext/standard/http_fopen_wrapper.c:

[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c gd.h

2003-02-08 Thread Pierre-Alain Joye

pajoye  Sat Feb  8 03:41:43 2003 EDT

  Modified files:  
/php4/ext/gd/libgd  gd.c gd.h 
  Log:
  Add gdImageEllipse
  Replace gdImageFilledEllipse by a new function (backported from
  the new phpgd)
  the new gdImageFilledEllipse fix bug bug #22103 (ellipse part)
  
  
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.44 php4/ext/gd/libgd/gd.c:1.45
--- php4/ext/gd/libgd/gd.c:1.44 Sat Feb  1 20:34:54 2003
+++ php4/ext/gd/libgd/gd.c  Sat Feb  8 03:41:42 2003
@@ -1534,7 +1534,11 @@
 void 
 gdImageArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color)
 {
-  gdImageFilledArc (im, cx, cy, w, h, s, e, color, gdNoFill);
+   if( (s%360)==(e%360) ){
+   gdImageEllipse(im, cx, cy, w, h, color);
+   } else {
+   gdImageFilledArc (im, cx, cy, w, h, s, e, color, gdNoFill);
+   }
 }
 
 void 
@@ -1620,10 +1624,103 @@
 }
 }
 
-void 
-gdImageFilledEllipse (gdImagePtr im, int cx, int cy, int w, int h, int color)
+
+/**
+ * Integer Ellipse functions (gdImageEllipse and gdImageFilledEllipse)
+ * Function added by Pierre-Alain Joye 02/08/2003 ([EMAIL PROTECTED])
+ * See the ellipse function simplification for the equation
+ * as well as the midpoint algorithm.
+ */
+
+void gdImageEllipse(gdImagePtr im, int mx, int my, int w, int h, int c)
 {
-  gdImageFilledArc (im, cx, cy, w, h, 0, 360, color, gdPie);
+   int x=0,mx1=0,mx2=0,my1=0,my2=0;
+   long aq,bq,dx,dy,r,rx,ry,a,b;
+
+   a=w1;
+   b=h1;
+   gdImageSetPixel(im,mx+a, my, c);
+   gdImageSetPixel(im,mx-a, my, c);
+   mx1 = mx-a;my1 = my;
+   mx2 = mx+a;my2 = my;
+
+   aq = a * a;
+   bq = b * b;
+   dx = aq  1;
+   dy = bq  1;
+   r  = a * bq;
+   rx = r  1;
+   ry = 0;
+   x = a;
+   while (x  0){
+   if (r  0) {
+   my1++;my2--;
+   ry +=dx;
+   r  -=ry;
+   }
+   if (r = 0){
+   x--;
+   mx1++;mx2--;
+   rx -=dy;
+   r  +=rx;
+   }
+   gdImageSetPixel(im,mx1, my1, c);
+   gdImageSetPixel(im,mx1, my2, c);
+   gdImageSetPixel(im,mx2, my1, c);
+   gdImageSetPixel(im,mx2, my2, c);
+   }
+}
+
+void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
+{
+   int x=0,mx1=0,mx2=0,my1=0,my2=0;
+   long aq,bq,dx,dy,r,rx,ry,a,b;
+   int i;
+   int old_y1,old_y2;
+
+   a=w1;
+   b=h1;
+
+   gdImageLine(im, mx-a, my, mx+a, my, c);
+
+   mx1 = mx-a;my1 = my;
+   mx2 = mx+a;my2 = my;
+
+   aq = a * a;
+   bq = b * b;
+   dx = aq  1;
+   dy = bq  1;
+   r  = a * bq;
+   rx = r  1;
+   ry = 0;
+   x = a;
+   old_y2=-1;
+   old_y1=-1;
+   while (x  0){
+   if (r  0) {
+   my1++;my2--;
+   ry +=dx;
+   r  -=ry;
+   }
+   if (r = 0){
+   x--;
+   mx1++;mx2--;
+   rx -=dy;
+   r  +=rx;
+   }
+   if(old_y2!=my2){
+   for(i=mx1;i=mx2;i++){
+   gdImageSetPixel(im,i,my1,c);
+   }
+   }
+   if(old_y2!=my2){
+   for(i=mx1;i=mx2;i++){
+   gdImageSetPixel(im,i,my2,c);
+   }
+   }
+   old_y2 = my2;
+   old_y1 = my1;
+   }
 }
 
 void
Index: php4/ext/gd/libgd/gd.h
diff -u php4/ext/gd/libgd/gd.h:1.14 php4/ext/gd/libgd/gd.h:1.15
--- php4/ext/gd/libgd/gd.h:1.14 Fri Jan 17 13:34:07 2003
+++ php4/ext/gd/libgd/gd.h  Sat Feb  8 03:41:43 2003
@@ -420,7 +420,7 @@
 /* Best to free this memory with gdFree(), not free() */
 void* gdImageGd2Ptr(gdImagePtr im, int cs, int fmt, int *size);
 
-void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color);
+void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int c);
 
 /* Style is a bitwise OR ( | operator ) of these.
gdArc and gdChord are mutually exclusive;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/gd/libgd gd.c gd.h

2003-02-08 Thread Pierre-Alain Joye

On Sat, 08 Feb 2003 08:54:13 -
Pierre-Alain Joye [EMAIL PROTECTED] wrote:

 pajoyeSat Feb  8 03:54:13 2003 EDT
 
   Modified files:  (Branch: PHP_4_3)
 /php4/ext/gd/libgdgd.c gd.h 
   Log:
   MFH:
   Add gdImageEllipse
   Replace gdImageFilledEllipse by a new function (backported from
   the new phpgd)
   the new gdImageFilledEllipse fix bug bug #22103 (ellipse part)

Someone can add it to the NEWS for both HEAD and PHP_4_3 ?

thanks

pierre

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /sapi/cli php_cli.c

2003-02-08 Thread Marcus Börger

At 15:56 08.02.2003, Jani Taskinen wrote:


Just curious..but was there some agreement on keeping these
obscure options?? I kinda missed the discussion..

--Jani


Some few people were against and Edin liked the idea after playing around 
with it.
So both maintainers of the cli sapi are on the pro side and i went further 
and made
it a round thing. Again i did this to ease use - a thing many guys here are 
missing.

If the discusion starts again and people are against there's no propbelem 
removing
the feature.

marcus


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard string.c

2003-02-08 Thread Jani Taskinen

sniper  Sat Feb  8 10:26:17 2003 EDT

  Modified files:  
/php4/ext/standard  string.c 
  Log:
  style  ws fixes
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.354 php4/ext/standard/string.c:1.355
--- php4/ext/standard/string.c:1.354Fri Feb  7 16:36:18 2003
+++ php4/ext/standard/string.c  Sat Feb  8 10:26:17 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.354 2003/02/07 21:36:18 iliaa Exp $ */
+/* $Id: string.c,v 1.355 2003/02/08 15:26:17 sniper Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -828,14 +828,13 @@
 
numelems = zend_hash_num_elements(Z_ARRVAL_P(arr));
 
-   if(numelems == 0) {
+   if (numelems == 0) {
RETURN_EMPTY_STRING();
}
 
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), pos);
-   while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), 
-(void 
**) tmp,
-pos) 
== SUCCESS) {
+
+   while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **) tmp, pos) == 
+SUCCESS) {
convert_to_string_ex(tmp);
 
smart_str_appendl(implstr, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
@@ -924,44 +923,47 @@
char *pe;
int skipped = 0;

-   if (ZEND_NUM_ARGS()  1 || ZEND_NUM_ARGS()  2 ||
-   zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE)
+   if (ZEND_NUM_ARGS()  1 || ZEND_NUM_ARGS()  2 || 
+zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
WRONG_PARAM_COUNT;
-   
-   switch (ZEND_NUM_ARGS()) {
-   case 1:
-   tok = args[0];
-   break;
-   default:
-   case 2:
-   str = args[0];
-   tok = args[1];
-   convert_to_string_ex(str);
-
-   zval_add_ref(str);
-   if (BG(strtok_zval))
-   zval_ptr_dtor(BG(strtok_zval));
-   BG(strtok_zval) = *str;
+   }

-   BG(strtok_last) = BG(strtok_string) = Z_STRVAL_PP(str);
-   BG(strtok_len) = Z_STRLEN_PP(str);
-   break;
+   switch (ZEND_NUM_ARGS()) {
+   case 1:
+   tok = args[0];
+   break;
+
+   default:
+   case 2:
+   str = args[0];
+   tok = args[1];
+   convert_to_string_ex(str);
+
+   zval_add_ref(str);
+   if (BG(strtok_zval)) {
+   zval_ptr_dtor(BG(strtok_zval));
+   }
+   BG(strtok_zval) = *str;
+   BG(strtok_last) = BG(strtok_string) = Z_STRVAL_PP(str);
+   BG(strtok_len) = Z_STRLEN_PP(str);
+   break;
}

p = BG(strtok_last); /* Where we start to search */
pe = BG(strtok_string) + BG(strtok_len);
 
-   if (!p || p = pe)
+   if (!p || p = pe) {
RETURN_FALSE;
+   }
 
convert_to_string_ex(tok);

token = Z_STRVAL_PP(tok);
token_end = token + Z_STRLEN_PP(tok);
 
-   while (token  token_end) 
+   while (token  token_end) {
STRTOK_TABLE(token++) = 1;
-
+   }
+   
/* Skip leading delimiters */
while (STRTOK_TABLE(p)) {
if (++p = pe) {
@@ -974,10 +976,12 @@
}

/* We know at this place that *p is no delimiter, so skip it */ 
-   while (++p  pe)
-   if (STRTOK_TABLE(p))
+   while (++p  pe) {
+   if (STRTOK_TABLE(p)) {
goto return_token;  
-
+   }
+   }
+   
if (p - BG(strtok_last)) {
 return_token:
RETVAL_STRINGL(BG(strtok_last) + skipped, (p - BG(strtok_last)) - 
skipped, 1);
@@ -987,13 +991,13 @@
BG(strtok_last) = NULL;
}
 
-   /* Restore table -- usually faster then memset'ing the table
-  on every invocation */
+   /* Restore table -- usually faster then memset'ing the table on every 
+invocation */
 restore:
token = Z_STRVAL_PP(tok);

-   while (token  token_end)
+   while (token  token_end) {
STRTOK_TABLE(token++) = 0;
+   }
 }
 /* }}} */
 
@@ -1083,14 +1087,15 @@
}
}
 
-
/* strip trailing slashes */
while (*c == '/'
 #ifdef PHP_WIN32
   || (*c == '\\'  !IsDBCSLeadByte(*(c-1)))
 #endif
-   )
+   ) {
c--;
+   }
+
if (c  s+len-1) {
buf = *(c + 1);  /* Save overwritten char */
*(c + 1) = '\0'; /*

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cli php.1

2003-02-08 Thread Marcus Boerger

helly   Sat Feb  8 10:27:34 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/sapi/cli  php.1 
  Log:
  MFH: manpage for this version
  

Index: php4/sapi/cli/php.1
+++ php4/sapi/cli/php.1
/+--+
/| PHP Version 4|
/+--+
/| Copyright (c) 1997-2003 The PHP Group|
/+--+
/| This source file is subject to version 2.02 of the PHP license,  |
/| that is bundled with this package in the file LICENSE, and is|
/| available at through the world-wide-web at   |
/| http://www.php.net/license/2_02.txt. |
/| If you did not receive a copy of the PHP license and are unable to   |
/| obtain it through the world-wide-web, please send a note to  |
/| [EMAIL PROTECTED] so we can mail you a copy immediately.   |
/+--+
/| Author: Marcus Boerger [EMAIL PROTECTED]   |
/+--+
/ 
/ $Id: php.1,v 1.1 2003/02/05 00:12:46 helly Exp $
/ 
TH PHP 1
SH NAME
B php
Command Line Interface 'CLI'
SH SYNOPSIS
B php
[options] [
B -f
]
IR file
[[--] 
IR args...
]
LP
B php
[options] 
B -r 
IR code
[[--]
IR args...
]
LP
B php
[options] [-B 
IR code
] 
B -R 
IR code
[-E 
IR code
] [[--]
IR args...
]
LP
B php
[options] [-B 
IR code
]
B -F 
IR file
[-E 
IR code
] [[--]
IR args...
]
LP
B php
[options] -- [
IR args...
]
LP
SH DESCRIPTION
You can parse and execute files by using parameter -f followed by the name of the 
IR file 
to be executed.
LP
Using parameter -r you can directly execute
B PHP 
IR code 
simply as you would do inside a 
B php 
file when using the 
B eval() 
function.
LP
It is also possible to process the standard input line by line using either
the parameter -R or -F. In this mode each separate input line causes the
IR code 
specified by -R or the 
IR file
specified by -F to be executed.
You can access the input line by \fB$argn\fP. While processing the input lines
B $argi 
contains the number of the actual line being processed. Further more
the paramters -B and -E can be used to execute 
IR code
(see -r) before and
after input line processing respectively.
LP
If none of -r -f -B -R -F or -E is present but a single parameter is
given then this is taken as the filename to process (same as with -f). If
no parameter is present then the standard input is read and executed.
SH OPTIONS
TP 15
B -a
Run interactively
TP
B -c path|file 
Look for 
B php.ini 
file in this directory
TP
B -n
No 
B php.ini 
file will be used
TP
B -d foo[=bar]
Define INI entry 
IR foo 
with value
IR bar
TP
B -e
Generate extended information for debugger/profiler
TP
B -f file
Parse and execute 
IR file
TP
B -h
This help
TP
B -i
B PHP
information
TP
B -l
Syntax check only (lint)
TP
B -m
Show compiled in modules
TP
B -r code
Run 
B PHP 
IR code
without using script tags
B '?..?'
TP
B -B code
Run 
B PHP 
IR code
before processing input lines
TP
B -R code
Run 
B PHP 
IR code
for every input line
TP
B -F file
Parse and execute 
IR file
for every input line
TP
B -E code
Run 
B PHP 
IR code
after processing all input lines
TP
B -s
Display colour syntax highlighted source
TP
B -v
Version number
TP
B -w
Display source with stripped comments and whitespace
TP
B -z file
Load Zend extension 
IR file
TP
IR args...
Arguments passed to script. Use 
B '--'
IR args 
when first argument starts with 
B '-'
or script is read from stdin
SH FILES
TP 15
B php-cli.ini
The configuration file for the CLI version of 
B PHP.
TP
B php.ini
The standard configuration file will only be used when 
B php-cli.ini
cannot not be found.
SH COPYRIGHT
Copyright (c) 1997-2003 The PHP Group
LP
This source file is subject to version 2.02 of the 
B PHP 
license,
that is bundled with this package in the file LICENSE, and is
available at through the world-wide-web at
BR
B http://www.php.net/license/2_02.txt.
If you did not receive a copy of the PHP license and are unable to
obtain it through the world-wide-web, please send a note to
B [EMAIL PROTECTED] 
so we can mail you a copy immediately.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/cli php.1

2003-02-08 Thread Marcus Boerger

helly   Sat Feb  8 10:29:35 2003 EDT

  Modified files:  
/php4/sapi/cli  php.1 
  Log:
  Style corrections
  See also: Stig's intro
  Version info
  
Index: php4/sapi/cli/php.1
diff -u php4/sapi/cli/php.1:1.4 php4/sapi/cli/php.1:1.5
--- php4/sapi/cli/php.1:1.4 Fri Feb  7 17:12:02 2003
+++ php4/sapi/cli/php.1 Sat Feb  8 10:29:35 2003
@@ -14,9 +14,9 @@
 ./| Author: Marcus Boerger [EMAIL PROTECTED]   |
 ./+--+
 ./ 
-./ $Id: php.1,v 1.4 2003/02/07 22:12:02 helly Exp $
+./ $Id: php.1,v 1.5 2003/02/08 15:29:35 helly Exp $
 ./ 
-.TH PHP 1
+.TH PHP 1 Feb 2003 The PHP Group Scripting Language
 .SH NAME
 .TP 15
 .B php
@@ -24,49 +24,41 @@
 .SH SYNOPSIS
 .B php
 [options] [
-.B \-f
-]
+.B \-f ]
 .IR file
 [[\-\-] 
-.IR args
-]
+.IR args.\|.\|. ]
 .LP
 .B php
 [options] 
 .B \-r 
 .IR code
 [[\-\-]
-.IR args
-]
+.IR args.\|.\|. ]
 .LP
 .B php
 [options] [\-B 
-.IR code
-] 
+.IR code ] 
 .B \-R 
 .IR code
 [\-E 
-.IR code
-] [[\-\-]
-.IR args
-]
+.IR code ]
+[[\-\-]
+.IR args.\|.\|. ]
 .LP
 .B php
 [options] [\-B 
-.IR code
-]
+.IR code ]
 .B \-F 
 .IR file
 [\-E 
-.IR code
-] [[\-\-]
-.IR args
-]
+.IR code ] 
+[[\-\-]
+.IR args.\|.\|. ]
 .LP
 .B php
 [options] \-\- [
-.IR args
-]
+.IR args.\|.\|. ]
 .LP
 .SH DESCRIPTION
 .B PHP
@@ -107,7 +99,7 @@
 .B \-a
 Run interactively
 .TP
-.B \-c path|file 
+.B \-c \fIpath\fP|\fIfile\fP
 Look for 
 .B php.ini 
 file in the directory
@@ -120,7 +112,7 @@
 .B php.ini 
 file will be used
 .TP
-.B \-d foo[=bar]
+.B \-d \fIfoo\fP[=\fIbar\fP]
 Define INI entry 
 .IR foo 
 with value
@@ -129,7 +121,7 @@
 .B \-e
 Generate extended information for debugger/profiler
 .TP
-.B \-f file
+.B \-f \fIfile\fP
 Parse and execute 
 .IR file
 .TP
@@ -145,28 +137,28 @@
 .B \-m
 Show compiled in modules
 .TP
-.B \-r code
+.B \-r \fIcode\fP
 Run PHP 
 .IR code
 without using script tags
 .B '?..?'
 .TP
-.B \-B code
+.B \-B \fIcode\fP
 Run PHP 
 .IR code
 before processing input lines
 .TP
-.B \-R code
+.B \-R \fIcode\fP
 Run PHP 
 .IR code
 for every input line
 .TP
-.B \-F file
+.B \-F \fIfile\fP
 Parse and execute 
 .IR file
 for every input line
 .TP
-.B \-E code
+.B \-E \fIcode\fP
 Run PHP 
 .IR code
 after processing all input lines
@@ -180,14 +172,14 @@
 .B \-w
 Display source with stripped comments and whitespace
 .TP
-.B \-z file
+.B \-z \fIfile\fP
 Load Zend extension 
 .IR file
 .TP
-.IR args
+.IR args.\|.\|.
 Arguments passed to script. Use 
 .B '\-\-'
-.IR args 
+.IR args
 when first argument starts with 
 .B '\-'
 or script is read from stdin
@@ -202,31 +194,34 @@
 cannot not be found.
 .SH EXAMPLES
 .TP 5
-php \-r 'echo Hello World\\n;'
+\fIphp -r 'echo Hello World\\n;'\fP
 This command simply writes the text Hello World to stabdard out.
 .TP
-php \-r 'print_r(gd_info());'
+\fIphp \-r 'print_r(gd_info());'\fP
 This shows the configuration of your gd extension. You can use this
 to easily check which imag formats you can use. If you have any
 dynamic modules you may want to use the same ini file that php uses
 when executed from your webserver. There are more extensions which
-have such a function. For dba use php \-r 'print_r(dba_handlers(1));'
+have such a function. For dba use:
+.RS
+\fIphp \-r 'print_r(dba_handlers(1));'\fP
+.RE
 .TP
-php \-d html_errors=1 \-i | php \-R 'echo strip_tags($argn).\\n;'
+\fIphp \-d html_errors=1 \-i | php \-R 'echo strip_tags($argn).\\n;'\fP
 This example uses PHP first to generate a HTML output. This is 
 meant to be replaced with any tool that displays HTML (for instance
 you could use 'cat file.html'). The second php command now strips off
 the HTML tags line by line and outputs the result.
 .TP
-php \-E 'echo Lines: $argi\\n;'
+\fIphp \-E 'echo Lines: $argi\\n;'\fP
 This command shows the number of lines being input.
 .TP
-php \-R '$l+=count(file($argn));' \-E'echo Lines:$l\\n;'
+\fIphp \-R '$l+=count(file($argn));' \-E'echo Lines:$l\\n;'\fP
 This commands expects each input line beeing a file. It counts all lines 
 of the files specified by each input line and shows the summarized result. 
 You may combine this with tools like find and change the php scriptlet.
 .TP
-php \-R 'echo $argn; fgets(STDIN);'
+\fIphp \-R 'echo $argn\\n; fgets(STDIN);'\fP
 Since you have access to STDIN from within \-B \-R and \-F you can skip certain
 input lines with your code. But note that in such cases $argi only counts the
 lines being processed by php itself. Having read this you will guess what the 
@@ -237,6 +232,7 @@
 such a first line as shown below:
 .P
 .PD 0
+.RS
 #!/bin/php
 .P
 ?php
@@ -244,6 +240,7 @@
  // your script
 .P
 ?
+.RE
 .PD 1
 .P
 .SH SEE ALSO
@@ -252,6 +249,12 @@
 .P
 .B http://www.php.net/manual/
 .PD 1
+.P
+A nice introduction to PHP by Stig Sæther Bakken can be found here:
+.PD 0
+.P
+.B http://www.zend.com/zend/art/intro.php
+.PD 1
 .SH BUGS
 You can view the list of known bugs or add any new bug you
 found

[PHP-CVS] cvs: CVSROOT / avail

2003-02-08 Thread Sascha Schumann

sas Sat Feb  8 11:02:01 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  give k.schroeder access to php4 for test-related work
  
  
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.590 CVSROOT/avail:1.591
--- CVSROOT/avail:1.590 Fri Feb  7 13:37:08 2003
+++ CVSROOT/avail   Sat Feb  8 11:02:00 2003
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP and PEAR, as well as the documentation.
 
-avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
+avail|mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,shuric,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,svbegg,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jedi,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder|phpfi,php3,php4,phpdoc,pear,peardoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
 
 
 # People who work on the Engine
@@ -45,7 +45,7 @@
 # The PEAR Team has access to the full PEAR tree, the PEAR portion of
 # the PHP 4 tree, the PEAR website, and the PEAR documentation.
 
-avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,k.schroeder,xnoguer,sjr,meebey,jellybob,darkelder,max|pear,peardoc
+avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max|pear,peardoc
 
 avail|cox,mj,vblavet,dickmann,tal|php4/pear
 
avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio|pearweb



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / avail

2003-02-08 Thread Sterling Hughes

sterlingSat Feb  8 11:03:57 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  ze2 access for georg
  
  
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.591 CVSROOT/avail:1.592
--- CVSROOT/avail:1.591 Sat Feb  8 11:02:00 2003
+++ CVSROOT/avail   Sat Feb  8 11:03:57 2003
@@ -21,7 +21,7 @@
 
 
 # People who work on the Engine
-avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,dali,rvenkat,imajes,jason,sesser,kalowsky,jmoore,iliaa,dreid,hyanantha|Zend,ZendEngine2,TSRM
+avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,dali,rvenkat,imajes,jason,sesser,kalowsky,jmoore,iliaa,dreid,hyanantha,georg|Zend,ZendEngine2,TSRM
 
 # The PHP Documentation Group maintains the documentation and its
 # translations.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gettext gettext.c

2003-02-08 Thread Sascha Schumann

sas Sat Feb  8 13:59:38 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gettext   gettext.c 
  Log:
  MFH
  
Index: php4/ext/gettext/gettext.c
diff -u php4/ext/gettext/gettext.c:1.39.4.1 php4/ext/gettext/gettext.c:1.39.4.2
--- php4/ext/gettext/gettext.c:1.39.4.1 Tue Dec 31 11:34:37 2002
+++ php4/ext/gettext/gettext.c  Sat Feb  8 13:59:38 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: gettext.c,v 1.39.4.1 2002/12/31 16:34:37 sebastian Exp $ */
+/* $Id: gettext.c,v 1.39.4.2 2003/02/08 18:59:38 sas Exp $ */
 
 #include stdio.h
 #ifdef HAVE_CONFIG_H
@@ -178,7 +178,12 @@
convert_to_string_ex(domain_name);
convert_to_string_ex(dir);
 
-   if (strcmp(Z_STRVAL_PP(dir), )  strcmp(Z_STRVAL_PP(dir), 0)) {
+   if (Z_STRVAL_PP(domain_name)[0] == '\0') {
+   php_error(E_WARNING, The first parameter of bindtextdomain must not 
+be empty);
+   RETURN_FALSE;
+   }
+   
+   if (Z_STRVAL_PP(dir)[0] != '\0'  strcmp(Z_STRVAL_PP(dir), 0)) {
VCWD_REALPATH(Z_STRVAL_PP(dir), dir_name);
} else {
VCWD_GETCWD(dir_name, MAXPATHLEN);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/gettext gettext.c

2003-02-08 Thread Derick Rethans

On Sat, 8 Feb 2003, Sascha Schumann wrote:

 sas   Sat Feb  8 13:58:34 2003 EDT
 
 - if (strcmp(Z_STRVAL_PP(dir), )  strcmp(Z_STRVAL_PP(dir), 0)) {
 + if (Z_STRVAL_PP(domain_name)[0] == '\0') {
 + php_error(E_WARNING, The first parameter of bindtextdomain must not 
be empty);
 + RETURN_FALSE;
 + }

Please use php_error_docref in new code...

Derick

-- 

-
 Derick Rethans http://derickrethans.nl/ 
 PHP Magazine - PHP Magazine for Professionals   http://php-mag.net/
-


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.dsp gd_bundled.dsp

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 00:47:06 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd.dsp gd_bundled.dsp 
  Log:
  Adding some missing defines to enable functions.
  Fixing bug #22130
  
Index: php4/ext/gd/gd.dsp
diff -u php4/ext/gd/gd.dsp:1.9 php4/ext/gd/gd.dsp:1.9.2.1
--- php4/ext/gd/gd.dsp:1.9  Fri Sep 27 09:31:43 2002
+++ php4/ext/gd/gd.dsp  Sun Feb  9 00:47:06 2003
@@ -46,7 +46,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D 
_WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D 
HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D 
HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D 
HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D 
HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 /FR 
/YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
+..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D 
+HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
+HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
+/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D 
+HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 /D 
+HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG
@@ -104,7 +104,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I 
..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D 
NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D 
HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_LIBTTF=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D 
HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /FR /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D 
HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D 
HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 /FR 
/YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I 
+..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D 
+HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
+HAVE_GD_STRINGTTF=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
+/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D 
+HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_GD_GD2 /D 
+HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG
Index: php4/ext/gd/gd_bundled.dsp
diff -u php4/ext/gd/gd_bundled.dsp:1.7.2.2 php4/ext/gd/gd_bundled.dsp:1.7.2.3
--- php4/ext/gd/gd_bundled.dsp:1.7.2.2  Mon Jan  6 05:42:10 2003
+++ php4/ext/gd/gd_bundled.dsp  Sun Feb  9 00:47:06 2003
@@ -44,7 +44,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D 
_WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D 
HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D 
HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 
/FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D 
HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D 
ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D 
HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D 
HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D 
HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_IMAGESETBRUSH /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd_bundled.dsp

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 01:26:45 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd_bundled.dsp 
  Log:
  Adding missing HAVE_GD_STRINGFTEX define
  
Index: php4/ext/gd/gd_bundled.dsp
diff -u php4/ext/gd/gd_bundled.dsp:1.7.2.3 php4/ext/gd/gd_bundled.dsp:1.7.2.4
--- php4/ext/gd/gd_bundled.dsp:1.7.2.3  Sun Feb  9 00:47:06 2003
+++ php4/ext/gd/gd_bundled.dsp  Sun Feb  9 01:26:45 2003
@@ -44,7 +44,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D 
_WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D 
HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D 
HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 
/FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D 
HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D 
ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D 
HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D 
HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D 
HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 
/FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I 
+..\..\..\bindlib_w32 /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 
+/D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
+/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D 
+HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D 
+HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
+HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D 
+HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D 
+HAVE_GD_IMAGESETTILE=1 /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
@@ -74,7 +74,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I 
..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D 
NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D 
HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D 
HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 
/FR /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D 
HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D 
ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D 
HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D 
HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D 
HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 
/FR /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I 
+..\..\..\bindlib_w32 /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 
+/D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 
+/D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D 
+HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D 
+HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D 
+HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D 
+HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D 
+HAVE_GD_IMAGESETTILE=1 /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c php_mssql.h

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 02:18:03 2003 EDT

  Modified files:  
/php4/ext/mssql php_mssql.c php_mssql.h 
  Log:
  Bug #21707 problem with real
  
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.102 php4/ext/mssql/php_mssql.c:1.103
--- php4/ext/mssql/php_mssql.c:1.102Wed Jan 29 21:33:13 2003
+++ php4/ext/mssql/php_mssql.c  Sun Feb  9 02:18:02 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.102 2003/01/30 02:33:13 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.103 2003/02/09 07:18:02 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -306,6 +306,7 @@
REGISTER_LONG_CONSTANT(SQLINT2,SQLINT2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLINT4,SQLINT4, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLBIT,SQLBIT, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(SQLFLT4,SQLFLT4, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLFLT8,SQLFLT8, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLFLTN,SQLFLTN, CONST_CS | CONST_PERSISTENT);
/* END MSSQL data types for mssql_sp_bind */
@@ -922,6 +923,7 @@
Z_LVAL_P(bind-zval) = *((int 
*)(dbretdata(mssql_ptr-link,i)));
break;

+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:

convert_to_double_ex(bind-zval);
@@ -992,6 +994,7 @@
case SQLINT2:
case SQLINT4:
case SQLINTN:
+   case SQLFLT4:
case SQLFLT8:
case SQLNUMERIC:
case SQLDECIMAL:
@@ -1419,6 +1422,7 @@
return datetime;
break;
case SQLDECIMAL:
+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:
return real;
@@ -1957,6 +1961,7 @@
 
switch (type)   {
 
+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:
convert_to_double_ex(var);
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.29 php4/ext/mssql/php_mssql.h:1.30
--- php4/ext/mssql/php_mssql.h:1.29 Thu Jan  9 03:00:07 2003
+++ php4/ext/mssql/php_mssql.h  Sun Feb  9 02:18:02 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.29 2003/01/09 08:00:07 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.30 2003/02/09 07:18:02 fmk Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -80,7 +80,7 @@
 #define tinyintcol(i) ((int) *(DBTINYINT *) dbdata(mssql_ptr-link,i))
 #define anyintcol(j) 
(coltype(j)==SQLINT4?intcol(j):(coltype(j)==SQLINT2?smallintcol(j):tinyintcol(j)))
 #define charcol(i) ((DBCHAR *) dbdata(mssql_ptr-link,i))
-#define floatcol4(i) (*(DBFLT8 *) dbdata(mssql_ptr-link,i))
+#define floatcol4(i) (*(DBFLT4 *) dbdata(mssql_ptr-link,i))
 #define floatcol8(i) (*(DBFLT8 *) dbdata(mssql_ptr-link,i))
 
 #ifdef ZTS



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 02:18:27 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mssql php_mssql.c php_mssql.h 
  Log:
  Bug #21707 problem with real
  
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.86.2.10 php4/ext/mssql/php_mssql.c:1.86.2.11
--- php4/ext/mssql/php_mssql.c:1.86.2.10Sun Jan 12 01:29:33 2003
+++ php4/ext/mssql/php_mssql.c  Sun Feb  9 02:18:27 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.86.2.10 2003/01/12 06:29:33 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.11 2003/02/09 07:18:27 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -306,6 +306,7 @@
REGISTER_LONG_CONSTANT(SQLINT2,SQLINT2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLINT4,SQLINT4, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLBIT,SQLBIT, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(SQLFLT4,SQLFLT4, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLFLT8,SQLFLT8, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLFLTN,SQLFLTN, CONST_CS | CONST_PERSISTENT);
/* END MSSQL data types for mssql_sp_bind */
@@ -922,6 +923,7 @@
Z_LVAL_P(bind-zval) = *((int 
*)(dbretdata(mssql_ptr-link,i)));
break;

+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:

convert_to_double_ex(bind-zval);
@@ -992,6 +994,7 @@
case SQLINT2:
case SQLINT4:
case SQLINTN:
+   case SQLFLT4:
case SQLFLT8:
case SQLNUMERIC:
case SQLDECIMAL:
@@ -1421,6 +1424,7 @@
return datetime;
break;
case SQLDECIMAL:
+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:
return real;
@@ -1967,6 +1971,7 @@
 
switch (type)   {
 
+   case SQLFLT4:
case SQLFLT8:
case SQLFLTN:
convert_to_double_ex(var);
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.23.4.5 php4/ext/mssql/php_mssql.h:1.23.4.6
--- php4/ext/mssql/php_mssql.h:1.23.4.5 Thu Jan  9 03:28:19 2003
+++ php4/ext/mssql/php_mssql.h  Sun Feb  9 02:18:27 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.23.4.5 2003/01/09 08:28:19 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.23.4.6 2003/02/09 07:18:27 fmk Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -80,7 +80,7 @@
 #define tinyintcol(i) ((int) *(DBTINYINT *) dbdata(mssql_ptr-link,i))
 #define anyintcol(j) 
(coltype(j)==SQLINT4?intcol(j):(coltype(j)==SQLINT2?smallintcol(j):tinyintcol(j)))
 #define charcol(i) ((DBCHAR *) dbdata(mssql_ptr-link,i))
-#define floatcol4(i) (*(DBFLT8 *) dbdata(mssql_ptr-link,i))
+#define floatcol4(i) (*(DBFLT4 *) dbdata(mssql_ptr-link,i))
 #define floatcol8(i) (*(DBFLT8 *) dbdata(mssql_ptr-link,i))
 
 #ifdef ZTS



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

2003-02-08 Thread Yasuo Ohgaki

yohgaki Sun Feb  9 02:24:18 2003 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c 
  Log:
  Fixed improper result offset handling.
  Prevent error when connection is broken. (optional)
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.258 php4/ext/pgsql/pgsql.c:1.259
--- php4/ext/pgsql/pgsql.c:1.258Tue Feb  4 13:34:00 2003
+++ php4/ext/pgsql/pgsql.c  Sun Feb  9 02:24:18 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.258 2003/02/04 18:34:00 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.259 2003/02/09 07:24:18 yohgaki Exp $ */
 
 #include stdlib.h
 
@@ -579,7 +579,7 @@
RETURN_FALSE;
}
/* ensure that the link did not die */
-   if (PGG(auto_reset_persistent)) {
+   if (PGG(auto_reset_persistent)  1) {
/* need to send  get something from backend to
   make sure we catch CONNECTION_BAD everytime */
PGresult *pg_result;
@@ -930,7 +930,12 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Found results on this 
connection. Use pg_get_result() to get these results first.);
}
pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query));
-   
+   if ((PGG(auto_reset_persistent)  2)  PQstatus(pgsql) != CONNECTION_OK) {
+   PQclear(pgsql_result);
+   PQreset(pgsql);
+   pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query));
+   }
+
if (pgsql_result) {
status = PQresultStatus(pgsql_result);
} else {
@@ -951,7 +956,7 @@
pg_result = (pgsql_result_handle *) 
emalloc(sizeof(pgsql_result_handle));
pg_result-conn = pgsql;
pg_result-result = pgsql_result;
-   pg_result-row = -1;
+   pg_result-row = 0;
ZEND_REGISTER_RESOURCE(return_value, pg_result, 
le_result);
} else {
RETURN_FALSE;
@@ -1301,11 +1306,11 @@
pgsql_result = pg_result-result;
 
if (ZEND_NUM_ARGS() == 1) {
-   pg_result-row++;
pgsql_row = pg_result-row;
if (pgsql_row  0 || pgsql_row = PQntuples(pgsql_result)) {
RETURN_FALSE;
}
+   pg_result-row++;
} else {
if (Z_TYPE_PP(row) != IS_NULL) { 
convert_to_long_ex(row);
@@ -1317,11 +1322,11 @@
}
} else {
/* If 2nd param is NULL, use internal row counter to access 
next row */
-   pg_result-row++;
pgsql_row = pg_result-row;
if (pgsql_row  0 || pgsql_row = PQntuples(pgsql_result)) {
RETURN_FALSE;
}
+   pg_result-row++;
}
}
array_init(return_value);
@@ -1448,7 +1453,7 @@
}

/* seek to offset */
-   pg_result-row = row - 1;
+   pg_result-row = row;
RETURN_TRUE;
 }
 /* }}} */
@@ -2930,7 +2935,12 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results on this 
connection. Call pg_get_result() until it returns FALSE.);
}
if (!PQsendQuery(pgsql, query)) {
-   RETURN_FALSE;
+   if ((PGG(auto_reset_persistent)  2)  PQstatus(pgsql) != 
+CONNECTION_OK) {
+   PQreset(pgsql);
+   }
+   if (!PQsendQuery(pgsql, query)) {
+   RETURN_FALSE;
+   }
}
if (PQ_SETNONBLOCKING(pgsql, 0)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Cannot set connection to 
blocking mode.);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

2003-02-08 Thread Yasuo Ohgaki

yohgaki Sun Feb  9 02:24:37 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c 
  Log:
  MFH
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.7 php4/ext/pgsql/pgsql.c:1.244.2.8
--- php4/ext/pgsql/pgsql.c:1.244.2.7Tue Feb  4 13:34:10 2003
+++ php4/ext/pgsql/pgsql.c  Sun Feb  9 02:24:36 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.7 2003/02/04 18:34:10 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.8 2003/02/09 07:24:36 yohgaki Exp $ */
 
 #include stdlib.h
 
@@ -579,7 +579,7 @@
RETURN_FALSE;
}
/* ensure that the link did not die */
-   if (PGG(auto_reset_persistent)) {
+   if (PGG(auto_reset_persistent)  1) {
/* need to send  get something from backend to
   make sure we catch CONNECTION_BAD everytime */
PGresult *pg_result;
@@ -930,7 +930,12 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Found results on this 
connection. Use pg_get_result() to get these results first.);
}
pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query));
-   
+   if ((PGG(auto_reset_persistent)  2)  PQstatus(pgsql) != CONNECTION_OK) {
+   PQclear(pgsql_result);
+   PQreset(pgsql);
+   pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query));
+   }
+
if (pgsql_result) {
status = PQresultStatus(pgsql_result);
} else {
@@ -951,7 +956,7 @@
pg_result = (pgsql_result_handle *) 
emalloc(sizeof(pgsql_result_handle));
pg_result-conn = pgsql;
pg_result-result = pgsql_result;
-   pg_result-row = -1;
+   pg_result-row = 0;
ZEND_REGISTER_RESOURCE(return_value, pg_result, 
le_result);
} else {
RETURN_FALSE;
@@ -1301,11 +1306,11 @@
pgsql_result = pg_result-result;
 
if (ZEND_NUM_ARGS() == 1) {
-   pg_result-row++;
pgsql_row = pg_result-row;
if (pgsql_row  0 || pgsql_row = PQntuples(pgsql_result)) {
RETURN_FALSE;
}
+   pg_result-row++;
} else {
if (Z_TYPE_PP(row) != IS_NULL) { 
convert_to_long_ex(row);
@@ -1317,11 +1322,11 @@
}
} else {
/* If 2nd param is NULL, use internal row counter to access 
next row */
-   pg_result-row++;
pgsql_row = pg_result-row;
if (pgsql_row  0 || pgsql_row = PQntuples(pgsql_result)) {
RETURN_FALSE;
}
+   pg_result-row++;
}
}
array_init(return_value);
@@ -1448,7 +1453,7 @@
}

/* seek to offset */
-   pg_result-row = row - 1;
+   pg_result-row = row;
RETURN_TRUE;
 }
 /* }}} */
@@ -2934,7 +2939,12 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results on this 
connection. Call pg_get_result() until it returns FALSE.);
}
if (!PQsendQuery(pgsql, query)) {
-   RETURN_FALSE;
+   if ((PGG(auto_reset_persistent)  2)  PQstatus(pgsql) != 
+CONNECTION_OK) {
+   PQreset(pgsql);
+   }
+   if (!PQsendQuery(pgsql, query)) {
+   RETURN_FALSE;
+   }
}
if (PQ_SETNONBLOCKING(pgsql, 0)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Cannot set connection to 
blocking mode.);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mssql config.m4

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 02:48:41 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mssql config.m4 
  Log:
  Fixing autodetect of FreeTDS
  
Index: php4/ext/mssql/config.m4
diff -u php4/ext/mssql/config.m4:1.1.2.3 php4/ext/mssql/config.m4:1.1.2.4
--- php4/ext/mssql/config.m4:1.1.2.3Thu Jan  9 17:36:02 2003
+++ php4/ext/mssql/config.m4Sun Feb  9 02:48:40 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.1.2.3 2003/01/09 22:36:02 fmk Exp $
+dnl $Id: config.m4,v 1.1.2.4 2003/02/09 07:48:40 fmk Exp $
 dnl
 
 PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
@@ -13,8 +13,8 @@
   if test $PHP_MSSQL = yes; then
 
 for i in /usr/local /usr; do
-  if test -f $i/freetds/include/tds.h; then
-FREETDS_INSTALLATION_DIR=$i/freetds
+  if test -f $i/include/tds.h; then
+FREETDS_INSTALLATION_DIR=$i
 break
   fi
 done
@@ -27,8 +27,6 @@
 
 if test -f $PHP_MSSQL/include/tds.h; then
   FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-elif test -f $PHP_MSSQL/freetds/include/tds.h; then
-  FREETDS_INSTALLATION_DIR=$PHP_MSSQL/freetds
 else
   AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

2003-02-08 Thread Yasuo Ohgaki

yohgaki Sun Feb  9 02:50:16 2003 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c 
  Log:
  Fixed one more improper row offset handling.
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.259 php4/ext/pgsql/pgsql.c:1.260
--- php4/ext/pgsql/pgsql.c:1.259Sun Feb  9 02:24:18 2003
+++ php4/ext/pgsql/pgsql.c  Sun Feb  9 02:50:16 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.259 2003/02/09 07:24:18 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.260 2003/02/09 07:50:16 yohgaki Exp $ */
 
 #include stdlib.h
 
@@ -2975,7 +2975,7 @@
pg_result = (pgsql_result_handle *) emalloc(sizeof(pgsql_result_handle));
pg_result-conn = pgsql;
pg_result-result = pgsql_result;
-   pg_result-row = -1;
+   pg_result-row = 0;
ZEND_REGISTER_RESOURCE(return_value, pg_result, le_result);
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

2003-02-08 Thread Yasuo Ohgaki

yohgaki Sun Feb  9 02:50:31 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c 
  Log:
  MFH
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.8 php4/ext/pgsql/pgsql.c:1.244.2.9
--- php4/ext/pgsql/pgsql.c:1.244.2.8Sun Feb  9 02:24:36 2003
+++ php4/ext/pgsql/pgsql.c  Sun Feb  9 02:50:31 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.8 2003/02/09 07:24:36 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.244.2.9 2003/02/09 07:50:31 yohgaki Exp $ */
 
 #include stdlib.h
 
@@ -2979,7 +2979,7 @@
pg_result = (pgsql_result_handle *) emalloc(sizeof(pgsql_result_handle));
pg_result-conn = pgsql;
pg_result-result = pgsql_result;
-   pg_result-row = -1;
+   pg_result-row = 0;
ZEND_REGISTER_RESOURCE(return_value, pg_result, le_result);
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mssql config.m4

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 02:50:32 2003 EDT

  Modified files:  
/php4/ext/mssql config.m4 
  Log:
  MFB
  
Index: php4/ext/mssql/config.m4
diff -u php4/ext/mssql/config.m4:1.4 php4/ext/mssql/config.m4:1.5
--- php4/ext/mssql/config.m4:1.4Thu Jan  9 17:35:16 2003
+++ php4/ext/mssql/config.m4Sun Feb  9 02:50:31 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.4 2003/01/09 22:35:16 fmk Exp $
+dnl $Id: config.m4,v 1.5 2003/02/09 07:50:31 fmk Exp $
 dnl
 
 PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS,
@@ -13,8 +13,8 @@
   if test $PHP_MSSQL = yes; then
 
 for i in /usr/local /usr; do
-  if test -f $i/freetds/include/tds.h; then
-FREETDS_INSTALLATION_DIR=$i/freetds
+  if test -f $i/include/tds.h; then
+FREETDS_INSTALLATION_DIR=$i
 break
   fi
 done
@@ -27,8 +27,6 @@
 
 if test -f $PHP_MSSQL/include/tds.h; then
   FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-elif test -f $PHP_MSSQL/freetds/include/tds.h; then
-  FREETDS_INSTALLATION_DIR=$PHP_MSSQL/freetds
 else
   AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.h

2003-02-08 Thread Frank M. Kromann

fmk Sun Feb  9 02:50:56 2003 EDT

  Modified files:  
/php4/ext/mssql php_mssql.h 
  Log:
  MFB
  
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.30 php4/ext/mssql/php_mssql.h:1.31
--- php4/ext/mssql/php_mssql.h:1.30 Sun Feb  9 02:18:02 2003
+++ php4/ext/mssql/php_mssql.h  Sun Feb  9 02:50:56 2003
@@ -17,7 +17,7 @@
  */
 
 
-/* $Id: php_mssql.h,v 1.30 2003/02/09 07:18:02 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.31 2003/02/09 07:50:56 fmk Exp $ */
 
 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -65,7 +65,8 @@
 #define NO_MORE_RPC_RESULTS 3
 #define dbfreelogin dbloginfree
 #define dbrpcexec dbrpcsend
-typedef unsigned char *LPBYTE;
+typedef unsigned char  *LPBYTE;
+typedef float   DBFLT4;
 #else
 #define DBERRHANDLE(a, b) dbprocerrhandle(a, b)
 #define DBMSGHANDLE(a, b) dbprocmsghandle(a, b)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php4 / ChangeLog

[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c gd.h

Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/gd/libgd gd.c gd.h

Re: [PHP-CVS] cvs: php4 /sapi/cli php_cli.c

[PHP-CVS] cvs: php4 /ext/standard string.c

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cli php.1

[PHP-CVS] cvs: php4 /sapi/cli php.1

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gettext gettext.c

Re: [PHP-CVS] cvs: php4 /ext/gettext gettext.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.dsp gd_bundled.dsp

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd_bundled.dsp

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mssql config.m4

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

[PHP-CVS] cvs: php4 /ext/mssql config.m4

[PHP-CVS] cvs: php4 /ext/mssql php_mssql.h

22 matches

Site Navigation

Mail list logo

Footer information