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

2009-01-05 Thread Ilia Alshanetsky 
iliaa   Mon Jan  5 16:24:14 2009 UTC

  Modified files:  
/php-src/sapi/apache2handlerphp_functions.c 
/php-src/sapi/apachephp_apache.c 
/php-src/sapi/apache2filter php_functions.c 
/php-src/sapi/apache_hooks  php_apache.c 
  Log:
  Improved parameter handling
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.38r2=1.39diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.38 
php-src/sapi/apache2handler/php_functions.c:1.39
--- php-src/sapi/apache2handler/php_functions.c:1.38Wed Dec 31 11:12:39 2008
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan  5 16:24:13 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.38 2008/12/31 11:12:39 sebastian Exp $ */
+/* $Id: php_functions.c,v 1.39 2009/01/05 16:24:13 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -221,12 +221,11 @@
 PHP_FUNCTION(apache_note)
 {
php_struct *ctx;
-   char *note_name, *note_val;
+   char *note_name, *note_val = NULL;
int note_name_len, note_val_len;
char *old_note_val=NULL;
-   int arg_count = ZEND_NUM_ARGS();
 
-   if (zend_parse_parameters(arg_count TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
return;
}
 
@@ -234,7 +233,7 @@
 
old_note_val = (char *) apr_table_get(ctx-r-notes, note_name);
 
-   if (arg_count == 2) {
+   if (note_val) {
apr_table_set(ctx-r-notes, note_name, note_val);
}
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.110r2=1.111diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.110 
php-src/sapi/apache/php_apache.c:1.111
--- php-src/sapi/apache/php_apache.c:1.110  Wed Dec 31 11:12:39 2008
+++ php-src/sapi/apache/php_apache.cMon Jan  5 16:24:14 2009
@@ -17,7 +17,7 @@
|  David Sklar sk...@student.net |
+--+
  */
-/* $Id: php_apache.c,v 1.110 2008/12/31 11:12:39 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.111 2009/01/05 16:24:14 iliaa Exp $ */
 
 #include php_apache_http.h
 
@@ -180,18 +180,17 @@
Get and set Apache request notes */
 PHP_FUNCTION(apache_note)
 {
-   char *note_name, *note_val;
+   char *note_name, *note_val = NULL;
int note_name_len, note_val_len;
char *old_val;
-   int arg_count = ZEND_NUM_ARGS();
 
-   if (zend_parse_parameters(arg_count TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
return;
}
 
old_val = (char *) table_get(((request_rec 
*)SG(server_context))-notes, note_name);
 
-   if (arg_count == 2) {
+   if (note_val) {
table_set(((request_rec *)SG(server_context))-notes, 
note_name, note_val);
}
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.57r2=1.58diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.57 
php-src/sapi/apache2filter/php_functions.c:1.58
--- php-src/sapi/apache2filter/php_functions.c:1.57 Wed Dec 31 11:12:39 2008
+++ php-src/sapi/apache2filter/php_functions.c  Mon Jan  5 16:24:14 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.57 2008/12/31 11:12:39 sebastian Exp $ */
+/* $Id: php_functions.c,v 1.58 2009/01/05 16:24:14 iliaa Exp $ */
 
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -193,12 +193,11 @@
 PHP_FUNCTION(apache_note)
 {
php_struct *ctx;
-   char *note_name, *note_val;
+   char *note_name, *note_val = NULL;
int note_name_len, note_val_len;
char *old_note_val=NULL;
-   int arg_count = ZEND_NUM_ARGS();
 
-   if (zend_parse_parameters(arg_count TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, note_name, 
note_name_len, note_val, note_val_len) == FAILURE) {
return;
}
 
@@ -206,7 +205,7 @@
 
old_note_val = (char *) apr_table_get(ctx-r-notes, note_name);
 
-   if (arg_count == 2) {
+   if (note_val) {
apr_table_set(ctx-r-notes, note_name, note_val);
}
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.38r2=1.39diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u

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

2008-07-14 Thread Antony Dovgal 
tony2001Mon Jul 14 10:51:45 2008 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  use int for length
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.104r2=1.105diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.104 
php-src/sapi/apache/php_apache.c:1.105
--- php-src/sapi/apache/php_apache.c:1.104  Sat Jun 28 10:16:25 2008
+++ php-src/sapi/apache/php_apache.cMon Jul 14 10:51:45 2008
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.104 2008/06/28 10:16:25 indeyets Exp $ */
+/* $Id: php_apache.c,v 1.105 2008/07/14 10:51:45 tony2001 Exp $ */
 
 #include php_apache_http.h
 
@@ -142,7 +142,7 @@
 PHP_FUNCTION(apache_note)
 {
char *note_name, *note_val;
-   long note_name_len, note_val_len;
+   int note_name_len, note_val_len;
char *old_val;
int arg_count = ZEND_NUM_ARGS();
 
@@ -309,7 +309,7 @@
 PHP_FUNCTION(virtual)
 {
char *filename;
-   long filename_len;
+   int filename_len;
request_rec *rr = NULL;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename, 
filename_len) == FAILURE) {
@@ -350,6 +350,7 @@
 /* {{{ proto array getallheaders(void)
Alias for apache_request_headers() */
 /* }}} */
+
 /* {{{ proto array apache_request_headers(void)
Fetch all HTTP request headers */
 PHP_FUNCTION(apache_request_headers)
@@ -392,7 +393,7 @@
Set an Apache subprocess_env variable */
 PHP_FUNCTION(apache_setenv)
 {
-   long var_len, val_len;
+   int var_len, val_len;
zend_bool top=0;
char *var = NULL, *val = NULL;
request_rec *r = (request_rec *) SG(server_context);
@@ -416,7 +417,7 @@
 PHP_FUNCTION(apache_lookup_uri)
 {
char *filename;
-   long filename_len;
+   int filename_len;
request_rec *rr=NULL;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename, 
filename_len) == FAILURE) {
@@ -493,7 +494,7 @@
 PHP_FUNCTION(apache_exec_uri)
 {
char *filename;
-   long filename_len;
+   int filename_len;
request_rec *rr=NULL;
TSRMLS_FETCH();
 



-- 
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

2007-09-07 Thread Jani Taskinen 
janiFri Sep  7 08:49:07 2007 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  - Fixed bug #42579 (apache_reset_timeout() does not exist)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.100r2=1.101diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.100 
php-src/sapi/apache/php_apache.c:1.101
--- php-src/sapi/apache/php_apache.c:1.100  Mon Jan  1 09:29:36 2007
+++ php-src/sapi/apache/php_apache.cFri Sep  7 08:49:07 2007
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.100 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.101 2007/09/07 08:49:07 jani Exp $ */
 
 #include php_apache_http.h
 
@@ -64,8 +64,9 @@
PHP_FE(apache_child_terminate,  NULL)
PHP_FE(apache_setenv,   
NULL)
PHP_FE(apache_response_headers, NULL)
-   PHP_FE(apache_get_version,  NULL)
-   PHP_FE(apache_get_modules,  NULL)
+   PHP_FE(apache_get_version,  
NULL)
+   PHP_FE(apache_get_modules,  
NULL)
+   PHP_FE(apache_reset_timeout,NULL)
PHP_FALIAS(getallheaders, apache_request_headers, NULL)
{NULL, NULL, NULL}
 };

-- 
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-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

2006-09-27 Thread Derick Rethans 
derick  Wed Sep 27 18:18:59 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  - Updated the Apache 1.3 sapi as add_assoc_string's signature has been 
changed.
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.97r2=1.98diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.97 
php-src/sapi/apache/php_apache.c:1.98
--- php-src/sapi/apache/php_apache.c:1.97   Wed Sep  6 11:55:12 2006
+++ php-src/sapi/apache/php_apache.cWed Sep 27 18:18:59 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.97 2006/09/06 11:55:12 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.98 2006/09/27 18:18:59 derick Exp $ */
 
 #include php_apache_http.h
 
@@ -361,9 +361,7 @@
if (!tenv[i].key) {
continue;
}
-   if (add_assoc_string(return_value, tenv[i].key, 
(tenv[i].val==NULL) ?  : tenv[i].val, 1)==FAILURE) {
-   RETURN_FALSE;
-   }
+   add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) 
?  : tenv[i].val, 1);
 }
 }
 /* }}} */
@@ -381,9 +379,7 @@
 tenv = (table_entry *)env_arr-elts;
 for (i = 0; i  env_arr-nelts; ++i) {
if (!tenv[i].key) continue;
-   if (add_assoc_string(return_value, tenv[i].key, 
(tenv[i].val==NULL) ?  : tenv[i].val, 1)==FAILURE) {
-   RETURN_FALSE;
-   }
+   add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) 
?  : tenv[i].val, 1);
}
 }
 /* }}} */

-- 
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

2006-07-25 Thread Michael Wallner 
mikeTue Jul 25 20:22:29 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  - fix TS issue found by Jani
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.95r2=1.96diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.95 
php-src/sapi/apache/php_apache.c:1.96
--- php-src/sapi/apache/php_apache.c:1.95   Fri Jun  2 19:51:42 2006
+++ php-src/sapi/apache/php_apache.cTue Jul 25 20:22:28 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.95 2006/06/02 19:51:42 mike Exp $ */
+/* $Id: php_apache.c,v 1.96 2006/07/25 20:22:28 mike Exp $ */
 
 #include php_apache_http.h
 
@@ -329,7 +329,7 @@
RETURN_FALSE;
}
 
-   php_output_end_all();
+   php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
 
if (run_sub_req(rr)) {

-- 
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

2006-04-26 Thread Edin Kadribasic 
edink   Wed Apr 26 09:32:11 2006 UTC

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  MFB: Correctly import external data (#33292)
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/php_apache.c?r1=1.93r2=1.94diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.93 
php-src/sapi/apache/php_apache.c:1.94
--- php-src/sapi/apache/php_apache.c:1.93   Tue Mar  7 14:43:16 2006
+++ php-src/sapi/apache/php_apache.cWed Apr 26 09:32:11 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.93 2006/03/07 14:43:16 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.94 2006/04/26 09:32:11 edink Exp $ */
 
 #include php_apache_http.h
 
@@ -34,8 +34,13 @@
 
 #define SECTION(name)  PUTS(h2 name /h2\n)
 
+#ifndef PHP_WIN32
 extern module *top_module;
 extern module **ap_loaded_modules;
+#else
+extern  __declspec(dllimport) module *top_module;
+extern  __declspec(dllimport) module **ap_loaded_modules;
+#endif
 
 PHP_FUNCTION(virtual);
 PHP_FUNCTION(apache_request_headers);

-- 
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

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

2004-12-04 Thread Rasmus Lerdorf 
rasmus  Sat Dec  4 08:47:13 2004 EDT

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  Fix proto
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache/php_apache.c?r1=1.87r2=1.88ty=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.87 
php-src/sapi/apache/php_apache.c:1.88
--- php-src/sapi/apache/php_apache.c:1.87   Sat Dec  4 02:16:44 2004
+++ php-src/sapi/apache/php_apache.cSat Dec  4 08:47:13 2004
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.87 2004/12/04 07:16:44 rasmus Exp $ */
+/* $Id: php_apache.c,v 1.88 2004/12/04 13:47:13 rasmus Exp $ */
 
 #include php_apache_http.h
 
@@ -537,7 +537,7 @@
 }
 /* }}} */
 
-/* {{{ proto array apache_reset_timeout(void)
+/* {{{ proto bool apache_reset_timeout(void)
Reset the Apache write timer */
 PHP_FUNCTION(apache_reset_timeout)
 {

-- 
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

2003-09-09 Thread Jani Taskinen 
sniper  Tue Sep  9 17:30:49 2003 EDT

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  Show the runtime version of Apache instead of compile time.
  
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.82 php-src/sapi/apache/php_apache.c:1.83
--- php-src/sapi/apache/php_apache.c:1.82   Thu Aug 28 13:48:58 2003
+++ php-src/sapi/apache/php_apache.cTue Sep  9 17:30:48 2003
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.82 2003/08/28 17:48:58 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.83 2003/09/09 21:30:48 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -163,6 +163,7 @@
  */
 PHP_MINFO_FUNCTION(apache)
 {
+   char *apv = php_apache_get_version();
module *modp = NULL;
char output_buf[128];
 #if !defined(WIN32)  !defined(WINNT)
@@ -195,7 +196,9 @@
php_info_print_table_row(2, APACHE_TARGET, PHP_APACHE_TARGET);
 #endif
 
-   php_info_print_table_row(2, Apache Version, SERVER_VERSION);
+   if (apv  *apv) {
+   php_info_print_table_row(2, Apache Version, apv);
+   } 
 
 #ifdef APACHE_RELEASE
sprintf(output_buf, %d, APACHE_RELEASE);

-- 
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

2003-09-09 Thread Jani Taskinen 
sniper  Tue Sep  9 17:34:13 2003 EDT

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  fix typo
  
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.83 php-src/sapi/apache/php_apache.c:1.84
--- php-src/sapi/apache/php_apache.c:1.83   Tue Sep  9 17:30:48 2003
+++ php-src/sapi/apache/php_apache.cTue Sep  9 17:34:12 2003
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.83 2003/09/09 21:30:48 sniper Exp $ */
+/* $Id: php_apache.c,v 1.84 2003/09/09 21:34:12 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -163,7 +163,7 @@
  */
 PHP_MINFO_FUNCTION(apache)
 {
-   char *apv = php_apache_get_version();
+   char *apv = ap_get_server_version();
module *modp = NULL;
char output_buf[128];
 #if !defined(WIN32)  !defined(WINNT)

-- 
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

2003-09-09 Thread Jani Taskinen 
sniper  Tue Sep  9 17:38:32 2003 EDT

  Modified files:  
/php-src/sapi/apachephp_apache.c 
  Log:
  Nuke warning
  
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.84 php-src/sapi/apache/php_apache.c:1.85
--- php-src/sapi/apache/php_apache.c:1.84   Tue Sep  9 17:34:12 2003
+++ php-src/sapi/apache/php_apache.cTue Sep  9 17:38:31 2003
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.84 2003/09/09 21:34:12 sniper Exp $ */
+/* $Id: php_apache.c,v 1.85 2003/09/09 21:38:31 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -163,7 +163,7 @@
  */
 PHP_MINFO_FUNCTION(apache)
 {
-   char *apv = ap_get_server_version();
+   char *apv = (char *) ap_get_server_version();
module *modp = NULL;
char output_buf[128];
 #if !defined(WIN32)  !defined(WINNT)

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