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

2005-11-12 Thread Rasmus Lerdorf 

Jani Taskinen wrote:

sniper  Fri Nov 11 19:38:04 2005 EDT

  Modified files:  
/php-src/sapi/cli	php_cli.c 
  Log:
  - Fix the php -v output when neither --enable-debug or --enable-gcov 
is used. 
  #

  # Rasmus, now it should give proper output, please test.


Yup, fixed.

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

Re: [PHP-CVS] cvs: php-src /main rfc1867.c

2005-11-12 Thread Andrei Zmievski 

It can be closed, I think.

-Andrei


On Nov 11, 2005, at 9:38 AM, Antony Dovgal wrote:


Once again..
Is the bug #34362 still valid after this fix ?

On 11.11.2005 20:34, Andrei Zmievski wrote:


andreiFri Nov 11 12:34:19 2005 EDT
  Modified files:  /php-src/mainrfc1867.c   Log:
  Re-fix Marcus's fix.
http://cvs.php.net/diff.php/php-src/main/rfc1867.c? 
r1=1.177r2=1.178ty=u

Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.177 php-src/main/rfc1867.c:1.178
--- php-src/main/rfc1867.c:1.177Fri Nov 11 11:50:08 2005
+++ php-src/main/rfc1867.cFri Nov 11 12:34:16 2005
@@ -17,7 +17,7 @@
 
+ 
--+

  */
 -/* $Id: rfc1867.c,v 1.177 2005/11/11 16:50:08 helly Exp $ */
+/* $Id: rfc1867.c,v 1.178 2005/11/11 17:34:16 andrei Exp $ */
  /*
  *  This product includes software developed by the Apache Group
@@ -41,7 +41,6 @@
 static void safe_php_register_variable(char *var, char *strval,  
zval *track_vars_array, zend_bool override_protection TSRMLS_DC);

  #define SAFE_RETURN { \
-php_mb_flush_gpc_variables(num_vars, val_list, len_list,  
array_ptr TSRMLS_CC); \

 if (lbuf) efree(lbuf); \
 if (abuf) efree(abuf); \
 if (array_index) efree(array_index); \
@@ -1045,10 +1044,6 @@
 U_STRING_DECL(filename_key, filename, 8);
 U_STRING_DECL(maxfilesize_key, MAX_FILE_SIZE, 13);
 static zend_bool did_string_init = FALSE;
-#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
-int num_vars = 0, *len_list = NULL;
-char **val_list = NULL;
-#endif
  if (SG(request_info).content_length  SG(post_max_size)) {
 sapi_module.sapi_error(E_WARNING, POST Content-Length of  
%ld bytes exceeds the limit of %ld bytes, SG 
(request_info).content_length, SG(post_max_size));

@@ -1601,6 +1596,7 @@
 zend_llist_clean(header);
  if (!multipart_buffer_headers(mbuff, header TSRMLS_CC)) {
+php_mb_flush_gpc_variables(num_vars, val_list,  
len_list, array_ptr TSRMLS_CC);

 SAFE_RETURN;
 }
 @@ -1680,6 +1676,7 @@
 /* Return with an error if the posted data is garbled */
 if (!param  !filename) {
 sapi_module.sapi_error(E_WARNING, File Upload  
Mime headers garbled);
+php_mb_flush_gpc_variables(num_vars, val_list,  
len_list, array_ptr TSRMLS_CC);

 SAFE_RETURN;
 }
 @@ -1986,6 +1983,7 @@
 }
 }
 +php_mb_flush_gpc_variables(num_vars, val_list, len_list,  
array_ptr TSRMLS_CC);

 SAFE_RETURN;
 }





--
Wbr, Antony Dovgal



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

Re: [PHP-CVS] cvs: php-src /main rfc1867.c

2005-11-12 Thread Antony Dovgal 

On 12.11.2005 12:12, Andrei Zmievski wrote:

It can be closed, I think.


Yup.
It's already done.

--
Wbr, 
Antony Dovgal


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

[PHP-CVS] cvs: php-src /main rfc1867.c

2005-11-12 Thread Andrei Zmievski 
andrei  Sat Nov 12 06:12:01 2005 EDT

  Modified files:  
/php-src/main   rfc1867.c 
  Log:
  Grr. Re-re-fix the fix.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.178r2=1.179ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.178 php-src/main/rfc1867.c:1.179
--- php-src/main/rfc1867.c:1.178Fri Nov 11 12:34:16 2005
+++ php-src/main/rfc1867.c  Sat Nov 12 06:11:53 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.178 2005/11/11 17:34:16 andrei Exp $ */
+/* $Id: rfc1867.c,v 1.179 2005/11/12 11:11:53 andrei Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -35,11 +35,6 @@
 
 #define DEBUG_FILE_UPLOAD ZEND_DEBUG
 
-#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
-#include ext/mbstring/mbstring.h
-
-static void safe_php_register_variable(char *var, char *strval, zval 
*track_vars_array, zend_bool override_protection TSRMLS_DC);
-
 #define SAFE_RETURN { \
if (lbuf) efree(lbuf); \
if (abuf) efree(abuf); \
@@ -52,6 +47,11 @@
if (mbuff) efree(mbuff); \
return; }
 
+#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
+#include ext/mbstring/mbstring.h
+
+static void safe_php_register_variable(char *var, char *strval, zval 
*track_vars_array, zend_bool override_protection TSRMLS_DC);
+
 void php_mb_flush_gpc_variables(int num_vars, char **val_list, int *len_list, 
zval *array_ptr  TSRMLS_DC)
 {
int i;
@@ -102,19 +102,6 @@
(*num_vars)++;
 }
 
-#else
-
-#define SAFE_RETURN { \
-   if (lbuf) efree(lbuf); \
-   if (abuf) efree(abuf); \
-   if (array_index) efree(array_index); \
-   zend_hash_destroy(PG(rfc1867_protected_variables)); \
-   zend_llist_destroy(header); \
-   if (mbuff-boundary_next) efree(mbuff-boundary_next); \
-   if (mbuff-boundary) efree(mbuff-boundary); \
-   if (mbuff-buffer) efree(mbuff-buffer); \
-   if (mbuff) efree(mbuff); \
-   return; }
 #endif
 
 /* The longest property name we use in an uploaded file array */
@@ -1596,7 +1583,9 @@
zend_llist_clean(header);
 
if (!multipart_buffer_headers(mbuff, header TSRMLS_CC)) {
+#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
php_mb_flush_gpc_variables(num_vars, val_list, 
len_list, array_ptr TSRMLS_CC);
+#endif
SAFE_RETURN;
}
 
@@ -1676,7 +1665,9 @@
/* Return with an error if the posted data is garbled */
if (!param  !filename) {
sapi_module.sapi_error(E_WARNING, File Upload 
Mime headers garbled);
+#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
php_mb_flush_gpc_variables(num_vars, val_list, 
len_list, array_ptr TSRMLS_CC);
+#endif
SAFE_RETURN;
}
 
@@ -1983,7 +1974,9 @@
}
}
 
+#if HAVE_MBSTRING  !defined(COMPILE_DL_MBSTRING)
php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr 
TSRMLS_CC);
+#endif
SAFE_RETURN;
 }
 

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

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

2005-11-12 Thread Derick Rethans 
derick  Sat Nov 12 09:56:39 2005 EDT

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  - Fixed protos.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.505r2=1.506ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.505 php-src/ext/standard/string.c:1.506
--- php-src/ext/standard/string.c:1.505 Fri Oct 28 15:29:29 2005
+++ php-src/ext/standard/string.c   Sat Nov 12 09:56:35 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.505 2005/10/28 19:29:29 fmk Exp $ */
+/* $Id: string.c,v 1.506 2005/11/12 14:56:35 derick Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1165,7 +1165,7 @@
 }
 /* }}} */
 
-/* {{{ proto string join(array src, string glue)
+/* {{{ proto string join([string glue,] array pieces)
An alias for implode */
 /* }}} */
 

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