[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2003-11-30 Thread Jani Taskinen
sniper  Sun Nov 30 04:39:50 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  BFN
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.486 php-src/NEWS:1.1247.2.487
--- php-src/NEWS:1.1247.2.486   Sat Nov 29 14:06:45 2003
+++ php-src/NEWSSun Nov 30 04:39:48 2003
@@ -3,6 +3,8 @@
 ?? ??? 2003, Version 4.3.5
 - Fixed header handler in NSAPI SAPI module (header-replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26467 (flock() does not force the wouldblock parameter to be 
+  passed by reference). (Wez)
 - Fixed bug #26463 (Incorrect handling of semicolons after heredoc). (Ilia)
 - Fixed bug #26462 (phpize + ext/bcmath - compile error). (Jani)
 - Fixed bug #26458 (var_dump(), var_export(), debug_zval_dump() not binary

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



[PHP-CVS] cvs: php-src / NEWS

2003-11-30 Thread Jani Taskinen
sniper  Sun Nov 30 04:41:33 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  New funcs
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1512 php-src/NEWS:1.1513
--- php-src/NEWS:1.1512 Sat Nov 29 12:00:53 2003
+++ php-src/NEWSSun Nov 30 04:41:32 2003
@@ -12,6 +12,7 @@
   . php_strip_whitespace(). strip whitespace  comments from a script. (Ilia)
   . php_check_syntax(). check php script for parse errors. (Ilia)
   . image_type_to_extension(). return extension based on image type. (Ilia)
+  . stream_socket_sendto() and stream_socket_recvfrom(). (Wez)
 - Route stat() and family via streams API. (Sara)
 - Fixed __autoload() to preserve case of the passed class name. (Andi)
 - Fixed bug #26072 (--disable-libxml does not work). (Jani)

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



[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c

2003-11-30 Thread Georg Richter
georg   Sun Nov 30 05:56:56 2003 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  prototype fix for mysqli_ssl_set
  
  
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.50 php-src/ext/mysqli/mysqli_api.c:1.51
--- php-src/ext/mysqli/mysqli_api.c:1.50Sat Nov 22 16:20:06 2003
+++ php-src/ext/mysqli/mysqli_api.c Sun Nov 30 05:56:55 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.50 2003/11/22 21:20:06 georg Exp $ 
+  $Id: mysqli_api.c,v 1.51 2003/11/30 10:56:55 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1836,7 +1836,7 @@
 #endif
 /* }}} */
 
-/* {{{ proto string mysqli_ssl_set(object link [,string key [,string cert [,string ca 
[,string capath [,string cipher])
+/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca 
,string capath ,string cipher])
 */
 PHP_FUNCTION(mysqli_ssl_set)
 {

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



[PHP-CVS] cvs: php-src /ext/dom/tests dom003.phpt

2003-11-30 Thread Christian Stocker
chregu  Sun Nov 30 05:58:19 2003 EDT

  Modified files:  
/php-src/ext/dom/tests  dom003.phpt 
  Log:
  output of uncaught exception changed
  
  
Index: php-src/ext/dom/tests/dom003.phpt
diff -u php-src/ext/dom/tests/dom003.phpt:1.1 php-src/ext/dom/tests/dom003.phpt:1.2
--- php-src/ext/dom/tests/dom003.phpt:1.1   Mon Oct 27 07:52:37 2003
+++ php-src/ext/dom/tests/dom003.phpt   Sun Nov 30 05:58:18 2003
@@ -22,16 +22,6 @@
 --EXPECTF--
 --- Catch exception with try/catch
 object(domexception)#3 (7) {
-  []=
-  string(23) Hierarchy Request Error
-  []=
-  string(0) 
-  []=
-  string(%d) %s
-  []=
-  int(8)
-  []=
-  NULL
   [code]=
   int(3)
   [trace]=

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



[PHP-CVS] cvs: php-src /ext/dom/examples dom1.php

2003-11-30 Thread Christian Stocker
chregu  Sun Nov 30 06:13:01 2003 EDT

  Modified files:  
/php-src/ext/dom/examples   dom1.php 
  Log:
  fixed typos
  
Index: php-src/ext/dom/examples/dom1.php
diff -u php-src/ext/dom/examples/dom1.php:1.2 php-src/ext/dom/examples/dom1.php:1.3
--- php-src/ext/dom/examples/dom1.php:1.2   Sat Nov 29 15:40:17 2003
+++ php-src/ext/dom/examples/dom1.php   Sun Nov 30 06:13:00 2003
@@ -80,8 +80,8 @@
 print_node_list($children);
 
 echo - Unlink Node\n;
-print_node($children.item(0));
-$rootnode-removeChild($children.item(0));
+print_node($children-item(0));
+$rootnode-removeChild($children-item(0));
 print_node_list($rootnode-childNodes);
 print $dom-savexml();
 

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



[PHP-CVS] cvs: php-src /ext/dom php_dom.c

2003-11-30 Thread Rob Richards
rrichards   Sun Nov 30 07:30:30 2003 EDT

  Modified files:  
/php-src/ext/domphp_dom.c 
  Log:
  remove call to xmlMemoryDump
  
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.41 php-src/ext/dom/php_dom.c:1.42
--- php-src/ext/dom/php_dom.c:1.41  Sat Nov 29 15:40:17 2003
+++ php-src/ext/dom/php_dom.c   Sun Nov 30 07:30:29 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_dom.c,v 1.41 2003/11/29 20:40:17 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.42 2003/11/30 12:30:29 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -692,7 +692,7 @@
uncomment the following line, this will tell you the amount of not freed memory
and the total used memory into apaches error_log  */
 /*  xmlMemoryDump();*/
-xmlMemoryDump();
+
return SUCCESS;
 }
 

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



[PHP-CVS] cvs: php-src /ext/mbstring/tests common.inc mb_convert_variables.phpt

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 08:20:27 2003 EDT

  Modified files:  
/php-src/ext/mbstring/tests common.inc mb_convert_variables.phpt 
  Log:
  Fix tests
  
Index: php-src/ext/mbstring/tests/common.inc
diff -u php-src/ext/mbstring/tests/common.inc:1.1 
php-src/ext/mbstring/tests/common.inc:1.2
--- php-src/ext/mbstring/tests/common.inc:1.1   Thu Mar  7 03:06:22 2002
+++ php-src/ext/mbstring/tests/common.inc   Sun Nov 30 08:20:26 2003
@@ -40,8 +40,8 @@
 
 class tc
 {
-   var $s1 = 'ÆüËܸìEUC-JP¤Îʸ»úÎó';
-   var $s2 = 'English Text';
+   public $s1 = 'ÆüËܸìEUC-JP¤Îʸ»úÎó';
+   public $s2 = 'English Text';
 
function tc() 
{
Index: php-src/ext/mbstring/tests/mb_convert_variables.phpt
diff -u php-src/ext/mbstring/tests/mb_convert_variables.phpt:1.4 
php-src/ext/mbstring/tests/mb_convert_variables.phpt:1.5
--- php-src/ext/mbstring/tests/mb_convert_variables.phpt:1.4Fri Sep 26 10:42:37 
2003
+++ php-src/ext/mbstring/tests/mb_convert_variables.phptSun Nov 30 08:20:26 
2003
@@ -72,9 +72,9 @@
 echo == OBJECT TEST ==\n;
 class foo 
 {
-   var $s1;
-   var $s2;
-   var $s3;
+   public $s1;
+   public $s2;
+   public $s3;
 
function foo() 
{
@@ -88,9 +88,9 @@
 
 class bar 
 {
-   var $s1;
-   var $s2;
-   var $s3;
+   public $s1;
+   public $s2;
+   public $s3;
 
function bar() 
{

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



[PHP-CVS] cvs: php-src / run-tests.php /ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 019.phpt /ext/standard/tests/file fopencookie.phpt userstreams.phpt /ext/standard/tests/serialize bug21957.phpt /tests/classes __call_001.phpt bug23951.phpt bug24399.phpt class_example.phpt destructor_and_references.phpt inheritance.phpt interface_doubled.phpt interface_implemented.phpt interface_member.phpt object_reference_001.phpt /tests/lang bug21669.phpt bug21961.phpt bug22231.phpt bug22367.phpt bug22510.phpt bug23922.phpt bug24403.phpt bug25652.phpt bug26182.phpt /tests/run-test test005.phpt test008.phpt test008a.phpt

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 08:57:21 2003 EDT

  Modified files:  
/php-srcrun-tests.php 
/php-src/ext/session/tests  001.phpt 003.phpt 004.phpt 005.phpt 
006.phpt 019.phpt 
/php-src/ext/standard/tests/filefopencookie.phpt userstreams.phpt 
/php-src/ext/standard/tests/serialize   bug21957.phpt 
/php-src/tests/classes  __call_001.phpt bug23951.phpt bug24399.phpt 
class_example.phpt 
destructor_and_references.phpt 
inheritance.phpt interface_doubled.phpt 
interface_implemented.phpt 
interface_member.phpt 
object_reference_001.phpt 
/php-src/tests/lang bug21669.phpt bug21961.phpt bug22231.phpt 
bug22367.phpt bug22510.phpt bug23922.phpt 
bug24403.phpt bug25652.phpt bug26182.phpt 
/php-src/tests/run-test test005.phpt test008.phpt test008a.phpt 
  Log:
  Fix tests for E_STRICT and check for E_STRICT in run-tests.php.
  
  Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.179 php-src/run-tests.php:1.180
--- php-src/run-tests.php:1.179 Thu Oct  2 14:11:10 2003
+++ php-src/run-tests.php   Sun Nov 30 08:57:15 2003
@@ -163,7 +163,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
-   'error_reporting=2047',
+   'error_reporting=4095',
'display_errors=1',
'log_errors=0',
'html_errors=0',
Index: php-src/ext/session/tests/001.phpt
diff -u php-src/ext/session/tests/001.phpt:1.9 php-src/ext/session/tests/001.phpt:1.10
--- php-src/ext/session/tests/001.phpt:1.9  Mon Nov 25 18:20:05 2002
+++ php-src/ext/session/tests/001.phpt  Sun Nov 30 08:57:16 2003
@@ -12,7 +12,7 @@
 error_reporting(E_ALL);
 
 class foo {
-   var $bar = ok;
+   public $bar = ok;
 
function method() { $this-yes = done; }
 }
Index: php-src/ext/session/tests/003.phpt
diff -u php-src/ext/session/tests/003.phpt:1.12 php-src/ext/session/tests/003.phpt:1.13
--- php-src/ext/session/tests/003.phpt:1.12 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/003.phpt  Sun Nov 30 08:57:16 2003
@@ -12,7 +12,7 @@
 error_reporting(E_ALL);
 
 class foo {
-   var $bar = ok;
+   public $bar = ok;
function method() { $this-yes++; }
 }
 
Index: php-src/ext/session/tests/004.phpt
diff -u php-src/ext/session/tests/004.phpt:1.15 php-src/ext/session/tests/004.phpt:1.16
--- php-src/ext/session/tests/004.phpt:1.15 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/004.phpt  Sun Nov 30 08:57:16 2003
@@ -13,7 +13,7 @@
 error_reporting(E_ALL);
 
 class handler {
-   var $data = 
'baz|O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}arr|a:1:{i:3;O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}}';
+   public $data = 
'baz|O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}arr|a:1:{i:3;O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}}';
 function open($save_path, $session_name)
 {
 print OPEN: $session_name\n;
@@ -48,7 +48,7 @@
 $hnd = new handler;
 
 class foo {
-var $bar = ok;
+public $bar = ok;
 function method() { $this-yes++; }
 }
 
Index: php-src/ext/session/tests/005.phpt
diff -u php-src/ext/session/tests/005.phpt:1.13 php-src/ext/session/tests/005.phpt:1.14
--- php-src/ext/session/tests/005.phpt:1.13 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/005.phpt  Sun Nov 30 08:57:16 2003
@@ -14,7 +14,7 @@
 error_reporting(E_ALL);
 
 class handler {
-   var $data = 
'baz|O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}arr|a:1:{i:3;O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}}';
+   public $data = 
'baz|O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}arr|a:1:{i:3;O:3:foo:2:{s:3:bar;s:2:ok;s:3:yes;i:1;}}';
 function open($save_path, $session_name)
 {
 print OPEN: $session_name\n;
@@ -50,7 +50,7 @@
 $hnd = new handler;
 
 class foo {
-var $bar = ok;
+public $bar = ok;
 function method() { $this-yes++; }
 }
 
Index: php-src/ext/session/tests/006.phpt
diff -u php-src/ext/session/tests/006.phpt:1.12 php-src/ext/session/tests/006.phpt:1.13
--- php-src/ext/session/tests/006.phpt:1.12 Sat May 31 09:10:00 2003
+++ php-src/ext/session/tests/006.phpt  Sun Nov 30 08:57:16 2003
@@ -15,11 +15,11 @@
 session_start();
 
 class a {
-var $test = hallo;
+public $test = hallo;
 }
  
 class b {
-var $a;
+public $a;
 function b($a) {
 $this-a = $a;
 }
Index: php-src/ext/session/tests/019.phpt
diff -u php-src/ext/session/tests/019.phpt:1.6 php-src/ext/session/tests/019.phpt:1.7
--- php-src/ext/session/tests/019.phpt:1.6  Fri Jun 13 05:19:52 2003
+++ php-src/ext/session/tests/019.phpt  Sun Nov 30 08:57:16 2003
@@ -13,7 +13,7 @@
 error_reporting(E_ALL);
 
 class TFoo {
-   var $c;
+   public $c;
function TFoo($c) {
 

[PHP-CVS] cvs: spl /examples filter.inc filter_tree.php sub_dir.inc

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 11:14:57 2003 EDT

  Removed files:   
/spl/examples   filter.inc filter_tree.php sub_dir.inc 
  Log:
  Remove old files
  
  

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



[PHP-CVS] cvs: spl /examples parentiterator.inc

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 11:20:03 2003 EDT

  Modified files:  
/spl/examples   parentiterator.inc 
  Log:
  Require inner iterator to be RecursiveIterator
  
  
Index: spl/examples/parentiterator.inc
diff -u spl/examples/parentiterator.inc:1.1 spl/examples/parentiterator.inc:1.2
--- spl/examples/parentiterator.inc:1.1 Sat Nov 22 15:52:06 2003
+++ spl/examples/parentiterator.inc Sun Nov 30 11:20:03 2003
@@ -2,6 +2,10 @@
 
 class ParentIterator extends FilterIterator implements RecursiveIterator
 {
+   function __construct(RecursiveIterator $it)
+   {
+   parent::__construct($it);
+   }
function accept()
{
return $this-it-hasChildren();

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



[PHP-CVS] cvs: spl /examples filteriterator.inc

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 11:31:36 2003 EDT

  Modified files:  
/spl/examples   filteriterator.inc 
  Log:
  Update
  
Index: spl/examples/filteriterator.inc
diff -u spl/examples/filteriterator.inc:1.1 spl/examples/filteriterator.inc:1.2
--- spl/examples/filteriterator.inc:1.1 Sun Nov  9 09:05:36 2003
+++ spl/examples/filteriterator.inc Sun Nov 30 11:31:35 2003
@@ -5,10 +5,9 @@
  * @author  Marcus Boerger
  * @version 1.0
  *
- * Instances of this class act as a filter around iterators whose elements
- * are strings. In other words you can put an iterator into the constructor
- * and the instance will only return elements which match the given regular 
- * expression.
+ * Instances of this class act as a filter around iterators. In other words 
+ * you can put an iterator into the constructor and the instance will only 
+ * return selected (accepted) elements.
  */
 abstract class FilterIterator implements Iterator
 {
@@ -20,17 +19,26 @@
 * method is called.
 *
 * @param it Object that implements at least spl_forward
-* @patam regex  Regular expression used as a filter.
 */
function __construct(Iterator $it) {
$this-it = $it;
}
 
+   /**
+* Rewind the inner iterator.
+*/
function rewind() { 
$this-it-rewind();
$this-fetch();
}
 
+   /**
+* Accept function to decide whether an element of the inner iterator
+* should be accessible through the Filteriterator.
+*
+* @return whether or not to expose the current element of the inner
+* iterator.
+*/
abstract function accept();
 
/**

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



[PHP-CVS] cvs: spl / spl_functions.h

2003-11-30 Thread Marcus Boerger
helly   Sun Nov 30 12:05:11 2003 EDT

  Modified files:  
/splspl_functions.h 
  Log:
  Fix macros
  
Index: spl/spl_functions.h
diff -u spl/spl_functions.h:1.11 spl/spl_functions.h:1.12
--- spl/spl_functions.h:1.11Tue Nov 18 17:14:19 2003
+++ spl/spl_functions.h Sun Nov 30 12:05:10 2003
@@ -65,8 +65,8 @@
 #define SPL_ME(class_name, function_name, arg_info, flags) \
PHP_ME( spl_ ## class_name, function_name, arg_info, flags)

-#define SPL_ABSTRACT_ME(class_name, arg_info, flags) \
-   ZEND_ABSTRACT_ME( spl_ ## class_name, arg_info, flags)
+#define SPL_ABSTRACT_ME(class_name, function_name, arg_info) \
+   ZEND_ABSTRACT_ME( spl_ ## class_name, function_name, arg_info)
 
 #define SPL_METHOD(class_name, function_name) \
PHP_METHOD(spl_ ## class_name, function_name)

-- 
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 /main/streams xp_socket.c

2003-11-30 Thread Ilia Alshanetsky
iliaa   Sun Nov 30 14:43:30 2003 EDT

  Modified files:  
/php-src/main   network.c 
/php-src/main/streams   xp_socket.c 
  Log:
  Removed unused variables.
  
  
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.104 php-src/main/network.c:1.105
--- php-src/main/network.c:1.104Sat Nov 29 16:46:49 2003
+++ php-src/main/network.c  Sun Nov 30 14:43:28 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.104 2003/11/29 21:46:49 wez Exp $ */
+/* $Id: network.c,v 1.105 2003/11/30 19:43:28 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -481,17 +481,14 @@
 PHPAPI int php_network_parse_network_address_with_port(const char *addr, long 
addrlen, struct sockaddr *sa, socklen_t *sl TSRMLS_DC)
 {
char *colon;
-   char *host = NULL;
-   int is_v6;
char *tmp;
int ret = FAILURE;
short port;
struct sockaddr_in *in4 = (struct sockaddr_in*)sa;
-   struct sockaddr **sal, **psal;
+   struct sockaddr **psal;
int n;
char *errstr = NULL;
 #ifdef HAVE_IPV6
-   char *p;
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)sa;
 #endif
 
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.18 php-src/main/streams/xp_socket.c:1.19
--- php-src/main/streams/xp_socket.c:1.18   Sat Nov 29 16:46:50 2003
+++ php-src/main/streams/xp_socket.cSun Nov 30 14:43:30 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.18 2003/11/29 21:46:50 wez Exp $ */
+/* $Id: xp_socket.c,v 1.19 2003/11/30 19:43:30 iliaa Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -141,9 +141,11 @@
 static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 {
php_netstream_data_t *sock = (php_netstream_data_t*)stream-abstract;
+#ifdef PHP_WIN32
fd_set wrfds, efds;
int n;
struct timeval timeout;
+#endif
 
if (close_handle) {
 

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



[PHP-CVS] cvs: php-src /ext/standard mail.c

2003-11-30 Thread Ilia Alshanetsky
iliaa   Sun Nov 30 14:56:30 2003 EDT

  Modified files:  
/php-src/ext/standard   mail.c 
  Log:
  MFB: Fix for possible uninitialized usage of subject_r.
  
  
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.79 php-src/ext/standard/mail.c:1.80
--- php-src/ext/standard/mail.c:1.79Mon Oct 20 10:22:01 2003
+++ php-src/ext/standard/mail.c Sun Nov 30 14:56:30 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mail.c,v 1.79 2003/10/20 14:22:01 iliaa Exp $ */
+/* $Id: mail.c,v 1.80 2003/11/30 19:56:30 iliaa Exp $ */
 
 #include stdlib.h
 #include ctype.h
@@ -141,6 +141,8 @@
subject_r[i] = ' ';
}
}
+   } else {
+   subject_r = subject;
}
 
if (force_extra_parameters) {

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



[PHP-CVS] cvs: php-src /main SAPI.h

2003-11-30 Thread Derick Rethans
derick  Sun Nov 30 15:07:59 2003 EDT

  Modified files:  
/php-src/main   SAPI.h 
  Log:
  - Fixed standard wrapper for input filter.
  
  
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.106 php-src/main/SAPI.h:1.107
--- php-src/main/SAPI.h:1.106   Sat Nov 29 10:24:35 2003
+++ php-src/main/SAPI.h Sun Nov 30 15:07:58 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: SAPI.h,v 1.106 2003/11/29 15:24:35 derick Exp $ */
+/* $Id: SAPI.h,v 1.107 2003/11/30 20:07:58 derick Exp $ */
 
 #ifndef SAPI_H
 #define SAPI_H
@@ -276,7 +276,7 @@
 #define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char 
*content_type_dup, void *arg TSRMLS_DC)
 
 #define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval* 
destArray TSRMLS_DC)
-#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char 
*var, char **val, unsigned int val_len TSRMLS_DC)
+#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char 
*var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC)
 
 BEGIN_EXTERN_C()
 SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);

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



[PHP-CVS] cvs: php-src / README.input_filter

2003-11-30 Thread Derick Rethans
derick  Sun Nov 30 15:13:04 2003 EDT

  Modified files:  
/php-srcREADME.input_filter 
  Log:
  - And fix the README too.
  
  
Index: php-src/README.input_filter
diff -u php-src/README.input_filter:1.4 php-src/README.input_filter:1.5
--- php-src/README.input_filter:1.4 Sat Nov 29 10:30:50 2003
+++ php-src/README.input_filter Sun Nov 30 15:13:03 2003
@@ -85,7 +85,7 @@
 {
 php_info_print_table_start();
 php_info_print_table_row( 2, My Input Filter Support, enabled );
-php_info_print_table_row( 2, Revision, $Revision: 1.4 $);
+php_info_print_table_row( 2, Revision, $Revision: 1.5 $);
 php_info_print_table_end();
 }
 
@@ -93,7 +93,7 @@
  * (modified) variable. Returning 0 prevents PHP from registering the variable;
  * you can use this if your filter already registers the variable under a
  * different name, or if you just don't want the variable registered at all. */
-unsigned int  my_sapi_input_filter(int arg, char *var, char **val, unsigned int 
val_len, unsigned int *new_val_len)
+SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
 {
 zval new_var;
 zval *array_ptr = NULL;

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