summaryrefslogtreecommitdiff
path: root/mod_php4.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-09-13 00:35:03 +0000
committerZeev Suraski <zeev@php.net>1999-09-13 00:35:03 +0000
commit3f0696dada83f24df10dc1a0c05980690584eadf (patch)
tree2bdbaacd6212b2da9f72c23de2373a9562909632 /mod_php4.c
parentb2c0acb9ecc43387328a30cc3bb85ebd35fc454b (diff)
downloadphp-git-3f0696dada83f24df10dc1a0c05980690584eadf.tar.gz
Fix a buglet, and avoid crashing in phpinfo() (fixes an elusive legacy bug too)
Diffstat (limited to 'mod_php4.c')
-rw-r--r--mod_php4.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod_php4.c b/mod_php4.c
index f4e5d9dc5c..77fff0e5d4 100644
--- a/mod_php4.c
+++ b/mod_php4.c
@@ -36,6 +36,7 @@
#include "php.h"
#include "php_ini.h"
+#include "php_globals.h"
#include "SAPI.h"
#include "main.h"
@@ -241,6 +242,7 @@ static void init_request_info(SLS_D)
static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry)
{
php_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1, per_dir_entry->value, per_dir_entry->value_length+1, per_dir_entry->type);
+ return 0;
}
@@ -488,7 +490,7 @@ void php_init_handler(server_rec *s, pool *p)
apache_php_initialized = 1;
}
#if MODULE_MAGIC_NUMBER >= 19980527
- if (INI_INT(PG(expose_php)) {
+ if (PG(expose_php)) {
ap_add_version_component("PHP/" PHP_VERSION);
}
#endif