[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 11:13:45 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mbstring   mbstring.c 
  Log:
  removed mail.force_extra_parameters which is unsuppoted in php4.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.1r2=1.142.2.47.2.2ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.1 
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.2
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.1  Wed Sep 21 09:19:19 2005
+++ php-src/ext/mbstring/mbstring.c Fri Nov  4 11:13:44 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.142.2.47.2.1 2005/09/21 13:19:19 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.2 2005/11/04 16:13:44 hirokawa Exp $ */
 
 /*
  * PHP4 Multibyte String module mbstring
@@ -3474,7 +3474,6 @@
body_enc;   /* body transfar encoding */
mbfl_memory_device device;  /* automatic allocateable buffer for 
additional header */
const mbfl_language *lang;
-   char *force_extra_parameters = INI_STR(mail.force_extra_parameters);
int err = 0;
 
/* initialize */
@@ -3596,9 +3595,7 @@
extra_cmd = Z_STRVAL_PP(argv[4]);
}
 
-   if (force_extra_parameters) {
-   extra_cmd = estrdup(force_extra_parameters);
-   } else if (extra_cmd) {
+if (extra_cmd) {
extra_cmd = php_escape_shell_cmd(extra_cmd);
} 
 

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



Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2005-11-04 Thread Derick Rethans
On Fri, 4 Nov 2005, Rui Hirokawa wrote:

 hirokawa  Fri Nov  4 11:13:45 2005 EDT
 
   Modified files:  (Branch: PHP_4_4)
 /php-src/ext/mbstring mbstring.c 
   Log:
   removed mail.force_extra_parameters which is unsuppoted in php4.
   
   }
  
 - if (force_extra_parameters) {
 - extra_cmd = estrdup(force_extra_parameters);
 - } else if (extra_cmd) {
 +if (extra_cmd) {
   extra_cmd = php_escape_shell_cmd(extra_cmd);
   } 

Please fix your whitespace issues there. And does this close a bug, or 
something else?

regards,
Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci oci_statement.c

2005-11-04 Thread Wez Furlong
wez Fri Nov  4 13:11:43 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_ocioci_statement.c 
  Log:
  Fixes PECL Bug #5868; wrong iters count for OCIStmtExecute
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.7r2=1.16.2.8ty=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.7 
php-src/ext/pdo_oci/oci_statement.c:1.16.2.8
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.7Tue Nov  1 09:18:20 2005
+++ php-src/ext/pdo_oci/oci_statement.c Fri Nov  4 13:11:40 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_statement.c,v 1.16.2.7 2005/11/01 14:18:20 edink Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.8 2005/11/04 18:11:40 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -138,7 +138,7 @@
}
 
STMT_CALL(OCIStmtExecute, (S-H-svc, S-stmt, S-err,
-   (S-stmt_type == OCI_STMT_SELECT || 
S-have_blobs) ? 1 : 0, 0, NULL, NULL,
+   (S-stmt_type == OCI_STMT_SELECT  
!S-have_blobs) ? 0 : 1, 0, NULL, NULL,
mode));
 
if (!stmt-executed) {

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



[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 20:14:08 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mbstring   mbstring.c 
  Log:
  fixed white space issue.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.2r2=1.142.2.47.2.3ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.2 
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.3
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.2  Fri Nov  4 11:13:44 2005
+++ php-src/ext/mbstring/mbstring.c Fri Nov  4 20:14:05 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.142.2.47.2.2 2005/11/04 16:13:44 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.3 2005/11/05 01:14:05 hirokawa Exp $ */
 
 /*
  * PHP4 Multibyte String module mbstring
@@ -3595,7 +3595,7 @@
extra_cmd = Z_STRVAL_PP(argv[4]);
}
 
-if (extra_cmd) {
+   if (extra_cmd) {
extra_cmd = php_escape_shell_cmd(extra_cmd);
} 
 

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



Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2005-11-04 Thread Rui Hirokawa

white space issue was fixed now.
This is a bug fix patch.
5th parameter of mb_send_mail cannot be used since PHP 4.4.1
by this bug.
mail.force_extra_parameters is supported in PHP5, but, 
this patch was also applied to PHP_4_4 by unknown reasons.

Rui

On Fri, 4 Nov 2005 18:27:38 +0100 (CET)
Derick Rethans [EMAIL PROTECTED] wrote:

 On Fri, 4 Nov 2005, Rui Hirokawa wrote:
 
  hirokawaFri Nov  4 11:13:45 2005 EDT
  
Modified files:  (Branch: PHP_4_4)
  /php-src/ext/mbstring   mbstring.c 
Log:
removed mail.force_extra_parameters which is unsuppoted in php4.

  }
   
  -   if (force_extra_parameters) {
  -   extra_cmd = estrdup(force_extra_parameters);
  -   } else if (extra_cmd) {
  +if (extra_cmd) {
  extra_cmd = php_escape_shell_cmd(extra_cmd);
  } 
 
 Please fix your whitespace issues there. And does this close a bug, or 
 something else?
 
 regards,
 Derick
 
 -- 
 Derick Rethans
 http://derickrethans.nl | http://ez.no | http://xdebug.org
 
 
 -- 
 No virus found in this incoming message.
 Checked by AVG Free Edition.
 Version: 7.1.362 / Virus Database: 267.12.8/161 - Release Date: 2005/11/03

-- 
Rui Hirokawa [EMAIL PROTECTED]




-- 
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.362 / Virus Database: 267.12.8/161 - Release Date: 2005/11/03

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



[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/mbfl mbfilter.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 23:47:30 2005 EDT

  Modified files:  
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c 
  Log:
  fixed garbled multibyte characters.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.8
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7Fri Apr 22 01:03:10 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Nov  4 23:47:29 2005
@@ -1990,7 +1990,7 @@
break;
 
default:/* ASCII */
-   if (!qp_table[(c  0xff)]) { /* ordinary characters */
+   if (c = 0x00ff  !qp_table[(c  0xff)]) { /* ordinary 
characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0  c == 0x20) { /* repeat SPACE 
*/

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



[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring/libmbfl/mbfl mbfilter.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 23:48:25 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c 
  Log:
  MFH: fixed garbled multibyte characters.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.1.2.7r2=1.1.2.7.2.1ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.7 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.7.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.1.2.7Fri Apr 22 
01:03:38 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Nov  4 23:48:25 2005
@@ -1990,7 +1990,7 @@
break;
 
default:/* ASCII */
-   if (!qp_table[(c  0xff)]) { /* ordinary characters */
+   if (c = 0x00ff  !qp_table[(c  0xff)]) { /* ordinary 
characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0  c == 0x20) { /* repeat SPACE 
*/

-- 
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/mbstring/libmbfl/mbfl mbfilter.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 23:49:42 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c 
  Log:
  MFH: fixed garbled multibyte characters.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.2.2.7r2=1.2.2.8ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.7 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.8
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.2.2.7Fri Apr 22 
01:03:25 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Nov  4 23:49:40 2005
@@ -1990,7 +1990,7 @@
break;
 
default:/* ASCII */
-   if (!qp_table[(c  0xff)]) { /* ordinary characters */
+   if (c = 0x00ff  !qp_table[(c  0xff)]) { /* ordinary 
characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0  c == 0x20) { /* repeat SPACE 
*/

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring/libmbfl/mbfl mbfilter.c

2005-11-04 Thread Rui Hirokawa
hirokawaFri Nov  4 23:49:57 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/mbstring/libmbfl/mbfl  mbfilter.c 
  Log:
  MFH: fixed garbled multibyte characters.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7r2=1.7.2.1ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7 
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7Fri Apr 22 01:03:10 2005
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Nov  4 23:49:57 2005
@@ -1990,7 +1990,7 @@
break;
 
default:/* ASCII */
-   if (!qp_table[(c  0xff)]) { /* ordinary characters */
+   if (c = 0x00ff  !qp_table[(c  0xff)]) { /* ordinary 
characters */
mbfl_memory_device_output(c, pe-tmpdev);
pe-status1 = 1;
} else if (pe-status1 == 0  c == 0x20) { /* repeat SPACE 
*/

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



Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2005-11-04 Thread Rui Hirokawa

Derick,

This bug is #34830 and fixed in CVS.

Rui

-

white space issue was fixed now.
This is a bug fix patch.
5th parameter of mb_send_mail cannot be used since PHP 4.4.1
by this bug.
mail.force_extra_parameters is supported in PHP5, but, 
this patch was also applied to PHP_4_4 by unknown reasons.

Rui

On Fri, 4 Nov 2005 18:27:38 +0100 (CET)
Derick Rethans [EMAIL PROTECTED] wrote:

 On Fri, 4 Nov 2005, Rui Hirokawa wrote:
 
  hirokawaFri Nov  4 11:13:45 2005 EDT
  
Modified files:  (Branch: PHP_4_4)
  /php-src/ext/mbstring   mbstring.c 
Log:
removed mail.force_extra_parameters which is unsuppoted in php4.

  }
   
  -   if (force_extra_parameters) {
  -   extra_cmd = estrdup(force_extra_parameters);
  -   } else if (extra_cmd) {
  +if (extra_cmd) {
  extra_cmd = php_escape_shell_cmd(extra_cmd);
  } 
 
 Please fix your whitespace issues there. And does this close a bug, or 
 something else?
 
 regards,
 Derick
 
 -- 
 Derick Rethans
 http://derickrethans.nl | http://ez.no | http://xdebug.org
 
 
 -- 
 No virus found in this incoming message.
 Checked by AVG Free Edition.
 Version: 7.1.362 / Virus Database: 267.12.8/161 - Release Date: 2005/11/03

-- 
Rui Hirokawa [EMAIL PROTECTED]




-- 
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.362 / Virus Database: 267.12.8/161 - Release Date: 2005/11/03

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