[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri Dec 27 10:40:39 2002 EDT Modified files: /CVSROOTavail Log: Test commit Index: CVSROOT/avail diff -u CVSROOT/avail:1.565 CVSROOT/avail:1.566 --- CVSROOT/avail:1.565 Thu Dec 26 23:25:12 2002 +++ CVSROOT/avail Fri Dec 27 10:40:39 2002 @@ -1,7 +1,6 @@ # This files controls access (or 'karma') to the various CVS modules. # The basic syntax is 'avail|user1,user2|directory1,directory2'. See # cvs_acls for more details. - # By default, we make everything unavailable. unavail -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
iliaa Fri Dec 27 15:23:29 2002 EDT Modified files: /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1291 php4/NEWS:1.1292 --- php4/NEWS:1.1291Thu Dec 26 23:03:10 2002 +++ php4/NEWS Fri Dec 27 15:23:29 2002 @@ -1,8 +1,10 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 4.4.0 +- Fixed bug #17098 (make Apache aware that PHP scripts represent dynamic data + and should not be cached). (Ilia) - Make uniqid() parameters optional and allow any prefix length. (Marcus) -- New range() functionality +- New range() functionality (Ilia) . Support for float modifier. . Detection of numeric values inside strings passed as high low. . Proper handle the situations where high == low. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2filter php_functions.c
iliaa Fri Dec 27 17:02:18 2002 EDT
Modified files:
/php4/sapi/apache2filterphp_functions.c
Log:
Added MINFO() to Apache 2, which displays the Apache version all of the
loaded Apache modules.
Added apache_get_version() apache_get_modules() functions.
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.31
php4/sapi/apache2filter/php_functions.c:1.32
--- php4/sapi/apache2filter/php_functions.c:1.31Sat Nov 2 11:04:27 2002
+++ php4/sapi/apache2filter/php_functions.c Fri Dec 27 17:02:17 2002
@@ -16,9 +16,11 @@
+--+
*/
-/* $Id: php_functions.c,v 1.31 2002/11/02 16:04:27 imajes Exp $ */
+/* $Id: php_functions.c,v 1.32 2002/12/27 22:02:17 iliaa Exp $ */
#include php.h
+#include ext/standard/php_smart_str.h
+#include ext/standard/info.h
#include SAPI.h
#include apr_strings.h
@@ -37,6 +39,8 @@
#include php_apache.h
+extern module **ap_loaded_modules;
+
static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
{
php_struct *ctx;
@@ -286,8 +290,57 @@
}
/* }}} */
+static char *php_apache_get_version()
+{
+ return (char *) ap_get_server_version();
+}
+
+/* {{{ proto string apache_get_version(void)
+ Fetch Apache version */
+PHP_FUNCTION(apache_get_version)
+{
+ char *apv = php_apache_get_version();
+
+ if (apv *apv) {
+ RETURN_STRING(apv, 1);
+ } else {
+ RETURN_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto array apache_get_modules(void)
+ Get a list of loaded Apache modules */
+PHP_FUNCTION(apache_get_modules)
+{
+ int n;
+
+ array_init(return_value);
+
+ for (n = 0; ap_loaded_modules[n]; ++n) {
+ add_next_index_string(return_value, (char *)
+ap_loaded_modules[n]-name, 1);
+ }
+}
+/* }}} */
+
PHP_MINFO_FUNCTION(apache)
{
+ char *apv = php_apache_get_version();
+ smart_str tmp1 = {0};
+ int n;
+
+ for (n = 0; ap_loaded_modules[n]; ++n) {
+ smart_str_appends(tmp1, ap_loaded_modules[n]-name);
+ smart_str_appendc(tmp1, ' ');
+ }
+
+ php_info_print_table_start();
+ if (apv *apv) {
+ php_info_print_table_row(2, Apache Version, apv);
+ }
+ php_info_print_table_row(2, Loaded Apache Modules, tmp1.c);
+ smart_str_free(tmp1);
+ php_info_print_table_end();
}
static function_entry apache_functions[] = {
@@ -298,6 +351,8 @@
PHP_FE(apache_setenv, NULL)
PHP_FE(apache_getenv, NULL)
PHP_FE(apache_note, NULL)
+ PHP_FE(apache_get_version, NULL)
+ PHP_FE(apache_get_modules, 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: php4 /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c
iliaa Fri Dec 27 18:05:15 2002 EDT
Modified files:
/php4/sapi/apache php_apache.c
/php4/sapi/apache_hooks php_apache.c
Log:
Make the version code get the version from the current Apache, rather then
the Apache PHP was compiled against.
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.71 php4/sapi/apache/php_apache.c:1.72
--- php4/sapi/apache/php_apache.c:1.71 Fri Dec 27 17:47:06 2002
+++ php4/sapi/apache/php_apache.c Fri Dec 27 18:05:13 2002
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.71 2002/12/27 22:47:06 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.72 2002/12/27 23:05:13 iliaa Exp $ */
#include php_apache_http.h
@@ -507,7 +507,13 @@
Fetch Apache version */
PHP_FUNCTION(apache_get_version)
{
- RETURN_STRING(SERVER_VERSION, 1);
+ char *apv = (char *) ap_get_server_version();
+
+ if (apv *apv) {
+ RETURN_STRING(apv, 1);
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.6 php4/sapi/apache_hooks/php_apache.c:1.7
--- php4/sapi/apache_hooks/php_apache.c:1.6 Fri Dec 27 17:47:06 2002
+++ php4/sapi/apache_hooks/php_apache.c Fri Dec 27 18:05:15 2002
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.6 2002/12/27 22:47:06 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.7 2002/12/27 23:05:15 iliaa Exp $ */
#include php_apache_http.h
@@ -1916,7 +1916,13 @@
Fetch Apache version */
PHP_FUNCTION(apache_get_version)
{
- RETURN_STRING(SERVER_VERSION, 1);
+ char *apv = (char *) ap_get_server_version();
+
+ if (apv *apv) {
+ RETURN_STRING(apv, 1);
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/roxen roxen.c
iliaa Sat Dec 28 01:59:24 2002 EDT
Modified files:
/php4/sapi/roxenroxen.c
Log:
Fixed bug #21229 (missing 3rd argument to php_module_startup).
Index: php4/sapi/roxen/roxen.c
diff -u php4/sapi/roxen/roxen.c:1.54 php4/sapi/roxen/roxen.c:1.55
--- php4/sapi/roxen/roxen.c:1.54Tue Nov 26 00:57:05 2002
+++ php4/sapi/roxen/roxen.c Sat Dec 28 01:59:24 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: roxen.c,v 1.54 2002/11/26 05:57:05 sniper Exp $ */
+/* $Id: roxen.c,v 1.55 2002/12/28 06:59:24 iliaa Exp $ */
#include php.h
#ifdef HAVE_ROXEN
@@ -438,7 +438,7 @@
{
/* char buf[512]; */
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version, $Id: roxen.c,v 1.54 2002/11/26
05:57:05 sniper Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id: roxen.c,v 1.55 2002/12/28
+06:59:24 iliaa Exp $);
/* php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path, Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path, Ns_InfoErrorLog());
@@ -473,7 +473,7 @@
static int php_roxen_startup(sapi_module_struct *sapi_module)
{
- if(php_module_startup(sapi_module, php_roxen_module) == FAILURE) {
+ if(php_module_startup(sapi_module, php_roxen_module, 1) == FAILURE) {
return FAILURE;
} else {
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
