date:20051111

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

2005-11-11 Thread Jani Taskinen

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.
  
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.134&r2=1.135&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.134 php-src/sapi/cli/php_cli.c:1.135
--- php-src/sapi/cli/php_cli.c:1.134Sun Nov  6 17:41:51 2005
+++ php-src/sapi/cli/php_cli.c  Fri Nov 11 19:38:00 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.134 2005/11/06 22:41:51 sniper Exp $ */
+/* $Id: php_cli.c,v 1.135 2005/11/12 00:38:00 sniper Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -744,6 +744,8 @@
"(DEBUG)",
 #elif defined(HAVE_GCOV)
"(GCOV)",
+#else
+   "",
 #endif
get_zend_version()
);

-- 
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-11 Thread Antony Dovgal


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

On 11.11.2005 20:34, Andrei Zmievski wrote:

andrei  Fri Nov 11 12:34:19 2005 EDT

  Modified files:  
/php-src/main	rfc1867.c 
  Log:

  Re-fix Marcus's fix.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.177&r2=1.178&ty=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.c  Fri 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

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

2005-11-11 Thread Andrei Zmievski

andrei  Fri Nov 11 12:34:19 2005 EDT

  Modified files:  
/php-src/main   rfc1867.c 
  Log:
  Re-fix Marcus's fix.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.177&r2=1.178&ty=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.c  Fri 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;
 }
 

-- 
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-11 Thread Antony Dovgal


Does it fix this issue http://bugs.php.net/bug.php?id=34362 ?

On 11.11.2005 19:50, Marcus Boerger wrote:

helly   Fri Nov 11 11:50:10 2005 EDT

  Modified files:  
/php-src/main	rfc1867.c 
  Log:

  - Fix build
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.176&r2=1.177&ty=u

Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.176 php-src/main/rfc1867.c:1.177
--- php-src/main/rfc1867.c:1.176Tue Sep 27 13:50:00 2005
+++ php-src/main/rfc1867.c  Fri Nov 11 11:50:08 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.176 2005/09/27 17:50:00 andrei Exp $ */

+/* $Id: rfc1867.c,v 1.177 2005/11/11 16:50:08 helly Exp $ */
 
 /*

  *  This product includes software developed by the Apache Group
@@ -1045,6 +1045,10 @@
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));




--
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 /ext/standard php_fopen_wrapper.c

2005-11-11 Thread Marcus Boerger

helly   Fri Nov 11 11:51:24 2005 EDT

  Modified files:  
/php-src/ext/standard   php_fopen_wrapper.c 
  Log:
  - Use the const instead of hard coding
  
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.49&r2=1.50&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.49 
php-src/ext/standard/php_fopen_wrapper.c:1.50
--- php-src/ext/standard/php_fopen_wrapper.c:1.49   Sat Oct 29 11:49:28 2005
+++ php-src/ext/standard/php_fopen_wrapper.cFri Nov 11 11:51:24 2005
@@ -17,7 +17,7 @@
|  Hartmut Holzgraefe <[EMAIL PROTECTED]>   |
+--+
  */
-/* $Id: php_fopen_wrapper.c,v 1.49 2005/10/29 15:49:28 helly Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.50 2005/11/11 16:51:24 helly Exp $ */
 
 #include 
 #include 
@@ -169,11 +169,11 @@
return NULL;
}
}
-   return php_stream_temp_create(0, max_memory);   
+   return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory); 

}

if (!strcasecmp(path, "memory")) {
-   return php_stream_memory_create(0);
+   return php_stream_memory_create(TEMP_STREAM_DEFAULT);
}

if (!strcasecmp(path, "output")) {

-- 
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-11 Thread Marcus Boerger

helly   Fri Nov 11 11:50:10 2005 EDT

  Modified files:  
/php-src/main   rfc1867.c 
  Log:
  - Fix build
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.176&r2=1.177&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.176 php-src/main/rfc1867.c:1.177
--- php-src/main/rfc1867.c:1.176Tue Sep 27 13:50:00 2005
+++ php-src/main/rfc1867.c  Fri Nov 11 11:50:08 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.176 2005/09/27 17:50:00 andrei Exp $ */
+/* $Id: rfc1867.c,v 1.177 2005/11/11 16:50:08 helly Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1045,6 +1045,10 @@
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));

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

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

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

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

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

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

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

6 matches

Site Navigation

Mail list logo

Footer information