[PHP-CVS] cvs: php-src /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 13:30:18 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.98r2=1.99diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.98 
php-src/sapi/apache/php_apache.c:1.99
--- php-src/sapi/apache/php_apache.c:1.98   Wed Sep 27 18:18:59 2006
+++ php-src/sapi/apache/php_apache.cThu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.98 2006/09/27 18:18:59 derick Exp $ */
+/* $Id: php_apache.c,v 1.99 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include php_apache_http.h
 
@@ -235,9 +235,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp-next) {
-   strcat(modulenames, , );
+   strlcat(modulenames, , , sizeof(modulenames));
}
}
php_info_print_table_row(2, Loaded Modules, modulenames);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.26r2=1.27diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.26 
php-src/sapi/apache_hooks/php_apache.c:1.27
--- php-src/sapi/apache_hooks/php_apache.c:1.26 Wed Sep  6 11:55:12 2006
+++ php-src/sapi/apache_hooks/php_apache.c  Thu Dec 28 13:30:18 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.26 2006/09/06 11:55:12 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.27 2006/12/28 13:30:18 tony2001 Exp $ */
 
 #include php_apache_http.h
 
@@ -1637,9 +1637,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp-next) {
-   strcat(modulenames, , );
+   strlcat(modulenames, , , sizeof(modulenames));
}
}
php_info_print_table_row(2, Loaded Modules, modulenames);

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

[PHP-CVS] cvs: php-src /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

2006-09-06 Thread Nuno Lopes 
nlopess Wed Sep  6 11:55:12 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  MFB: more int-zend_bool conversions
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.96r2=1.97diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.96 
php-src/sapi/apache/php_apache.c:1.97
--- php-src/sapi/apache/php_apache.c:1.96   Tue Jul 25 20:22:28 2006
+++ php-src/sapi/apache/php_apache.cWed Sep  6 11:55:12 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.96 2006/07/25 20:22:28 mike Exp $ */
+/* $Id: php_apache.c,v 1.97 2006/09/06 11:55:12 nlopess Exp $ */
 
 #include php_apache_http.h
 
@@ -392,7 +392,8 @@
Set an Apache subprocess_env variable */
 PHP_FUNCTION(apache_setenv)
 {
-   int var_len, val_len, top=0;
+   int var_len, val_len;
+   zend_bool top=0;
char *var = NULL, *val = NULL;
request_rec *r = (request_rec *) SG(server_context);
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.25r2=1.26diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.25 
php-src/sapi/apache_hooks/php_apache.c:1.26
--- php-src/sapi/apache_hooks/php_apache.c:1.25 Fri Jun  2 19:51:43 2006
+++ php-src/sapi/apache_hooks/php_apache.c  Wed Sep  6 11:55:12 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.25 2006/06/02 19:51:43 mike Exp $ */
+/* $Id: php_apache.c,v 1.26 2006/09/06 11:55:12 nlopess Exp $ */
 
 #include php_apache_http.h
 
@@ -1795,7 +1795,8 @@
Set an Apache subprocess_env variable */
 PHP_FUNCTION(apache_setenv)
 {
-   int var_len, val_len, top=0;
+   int var_len, val_len;
+   zend_bool top=0;
char *var = NULL, *val = NULL;
request_rec *r = (request_rec *) SG(server_context);
 

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

[PHP-CVS] cvs: php-src /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c /sapi/nsapi nsapi.c /sapi/roxen roxen.c

2005-12-05 Thread Jani Taskinen 
sniper  Mon Dec  5 20:13:59 2005 EDT

  Modified files:  
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache_hooks  php_apache.c 
/php-src/sapi/nsapi nsapi.c 
/php-src/sapi/roxen roxen.c 
  Log:
  nuke php3 legacy
  
http://cvs.php.net/diff.php/php-src/sapi/apache/php_apache.c?r1=1.89r2=1.90ty=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89 
php-src/sapi/apache/php_apache.c:1.90
--- php-src/sapi/apache/php_apache.c:1.89   Wed Aug  3 10:08:45 2005
+++ php-src/sapi/apache/php_apache.cMon Dec  5 20:13:58 2005
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.89 2005/08/03 14:08:45 sniper Exp $ */
+/* $Id: php_apache.c,v 1.90 2005/12/06 01:13:58 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -135,7 +135,7 @@
Get and set Apache request notes */
 PHP_FUNCTION(apache_note)
 {
-   pval **arg_name, **arg_val;
+   zval **arg_name, **arg_val;
char *note_val;
int arg_count = ZEND_NUM_ARGS();
 
@@ -304,7 +304,7 @@
  */
 PHP_FUNCTION(virtual)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr = NULL;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) == 
FAILURE) {
@@ -411,7 +411,7 @@
Perform a partial request of the given URI to obtain information about it */
 PHP_FUNCTION(apache_lookup_uri)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr=NULL;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) == 
FAILURE) {
@@ -485,7 +485,7 @@
 
 PHP_FUNCTION(apache_exec_uri)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr=NULL;
TSRMLS_FETCH();
 
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.19r2=1.20ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19 
php-src/sapi/apache_hooks/php_apache.c:1.20
--- php-src/sapi/apache_hooks/php_apache.c:1.19 Wed Aug  3 10:08:49 2005
+++ php-src/sapi/apache_hooks/php_apache.c  Mon Dec  5 20:13:58 2005
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.19 2005/08/03 14:08:49 sniper Exp $ */
+/* $Id: php_apache.c,v 1.20 2005/12/06 01:13:58 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -105,7 +105,7 @@
zval_ptr_dtor(z);
 }
 
-static request_rec *get_apache_request(pval *z TSRMLS_DC)
+static request_rec *get_apache_request(zval *z TSRMLS_DC)
 {
request_rec *r;
zval **addr;
@@ -1711,7 +1711,7 @@
  */
 PHP_FUNCTION(virtual)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr = NULL;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) == 
FAILURE) {
@@ -1818,7 +1818,7 @@
Perform a partial request of the given URI to obtain information about it */
 PHP_FUNCTION(apache_lookup_uri)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr=NULL;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) == 
FAILURE) {
@@ -1892,7 +1892,7 @@
 
 PHP_FUNCTION(apache_exec_uri)
 {
-   pval **filename;
+   zval **filename;
request_rec *rr=NULL;
TSRMLS_FETCH();
 
http://cvs.php.net/diff.php/php-src/sapi/nsapi/nsapi.c?r1=1.69r2=1.70ty=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69 php-src/sapi/nsapi/nsapi.c:1.70
--- php-src/sapi/nsapi/nsapi.c:1.69 Wed Aug  3 10:08:50 2005
+++ php-src/sapi/nsapi/nsapi.c  Mon Dec  5 20:13:59 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: nsapi.c,v 1.69 2005/08/03 14:08:50 sniper Exp $ */
+/* $Id: nsapi.c,v 1.70 2005/12/06 01:13:59 sniper Exp $ */
 
 /*
  * PHP includes
@@ -310,7 +310,7 @@
 PHP_MINFO_FUNCTION(nsapi)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.69 
$);
+   php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.70 
$);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
 (nsapi_servact_service)?((zend_ini_long(zlib.output_compression, 
sizeof(zlib.output_compression), 0))?not supported with 
zlib.output_compression:enabled):not supported on this platform );
@@ -329,7 +329,7 @@
  */
 PHP_FUNCTION(nsapi_virtual)
 {
-   pval **uri;
+   zval **uri;
int rv;
char *value;
Request *rq;
http://cvs.php.net/diff.php/php-src/sapi/roxen/roxen.c?r1=1.61r2=1.62ty=u
Index: php-src/sapi/roxen/roxen.c
diff -u php-src/sapi/roxen/roxen.c:1.61 php-src/sapi/roxen/roxen.c:1.62
--- php-src/sapi/roxen/roxen.c:1.61