[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c php_functions.c sapi_apache2.c

[Zeev Suraski]

zeevMon Feb 24 10:10:37 2003 EDT

  Modified files:  
/php4/sapi/apache2filterapache_config.c php_functions.c 
sapi_apache2.c 
  Log:
  (possibly) fix Win32 builds of the Apache 2 filter
  
  
Index: php4/sapi/apache2filter/apache_config.c
diff -u php4/sapi/apache2filter/apache_config.c:1.29 
php4/sapi/apache2filter/apache_config.c:1.30
--- php4/sapi/apache2filter/apache_config.c:1.29Tue Dec 31 10:59:03 2002
+++ php4/sapi/apache2filter/apache_config.c Mon Feb 24 10:10:36 2003
@@ -16,7 +16,9 @@
+--+
  */
 
-/* $Id: apache_config.c,v 1.29 2002/12/31 15:59:03 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.30 2003/02/24 15:10:36 zeev Exp $ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include php.h
 #include php_ini.h
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.37 
php4/sapi/apache2filter/php_functions.c:1.38
--- php4/sapi/apache2filter/php_functions.c:1.37Mon Jan 27 20:25:34 2003
+++ php4/sapi/apache2filter/php_functions.c Mon Feb 24 10:10:36 2003
@@ -16,7 +16,10 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.37 2003/01/28 01:25:34 iliaa Exp $ */
+/* $Id: php_functions.c,v 1.38 2003/02/24 15:10:36 zeev Exp $ */
+
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include php.h
 #include ext/standard/php_smart_str.h
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.104 
php4/sapi/apache2filter/sapi_apache2.c:1.105
--- php4/sapi/apache2filter/sapi_apache2.c:1.104Mon Feb 10 14:12:02 2003
+++ php4/sapi/apache2filter/sapi_apache2.c  Mon Feb 24 10:10:36 2003
@@ -18,9 +18,11 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.104 2003/02/10 19:12:02 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.105 2003/02/24 15:10:36 zeev Exp $ */
 
 #include fcntl.h
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include php.h
 #include php_main.h



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

[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c php_apache.h php_functions.c sapi_apache2.c

[James Cox]

imajes  Sat Nov  2 11:04:28 2002 EDT

  Modified files:  
/php4/sapi/apache2filterapache_config.c php_apache.h 
php_functions.c sapi_apache2.c 
  Log:
  adding id tags 
  
  
Index: php4/sapi/apache2filter/apache_config.c
diff -u php4/sapi/apache2filter/apache_config.c:1.25 
php4/sapi/apache2filter/apache_config.c:1.26
--- php4/sapi/apache2filter/apache_config.c:1.25Wed Oct 23 06:11:38 2002
+++ php4/sapi/apache2filter/apache_config.c Sat Nov  2 11:04:26 2002
 -16,6 +16,8 
+--+
  */
 
+/* $Id: apache_config.c,v 1.26 2002/11/02 16:04:26 imajes Exp $ */
+
 #include php.h
 #include php_ini.h
 #include php_apache.h
Index: php4/sapi/apache2filter/php_apache.h
diff -u php4/sapi/apache2filter/php_apache.h:1.17 
php4/sapi/apache2filter/php_apache.h:1.18
--- php4/sapi/apache2filter/php_apache.h:1.17   Tue Oct 22 08:20:12 2002
+++ php4/sapi/apache2filter/php_apache.hSat Nov  2 11:04:27 2002
 -16,6 +16,8 
+--+
  */
 
+/* $Id: php_apache.h,v 1.18 2002/11/02 16:04:27 imajes Exp $ */
+
 #ifndef PHP_APACHE_H
 #define PHP_APACHE_H
 
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.30 
php4/sapi/apache2filter/php_functions.c:1.31
--- php4/sapi/apache2filter/php_functions.c:1.30Fri Nov  1 23:53:31 2002
+++ php4/sapi/apache2filter/php_functions.c Sat Nov  2 11:04:27 2002
 -16,6 +16,8 
+--+
  */
 
+/* $Id: php_functions.c,v 1.31 2002/11/02 16:04:27 imajes Exp $ */
+
 #include php.h
 #include SAPI.h
 
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.90 
php4/sapi/apache2filter/sapi_apache2.c:1.91
--- php4/sapi/apache2filter/sapi_apache2.c:1.90 Fri Nov  1 23:35:25 2002
+++ php4/sapi/apache2filter/sapi_apache2.c  Sat Nov  2 11:04:27 2002
 -18,6 +18,8 
+--+
  */
 
+/* $Id: sapi_apache2.c,v 1.91 2002/11/02 16:04:27 imajes Exp $ */
+
 #include fcntl.h
 
 #include php.h



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

[PHP-CVS] cvs: php4 /sapi/apache2filter apache_config.c

[Ilia Alshanetsky]

iliaa   Sat Nov  2 18:08:20 2002 EDT

  Modified files:  
/php4/sapi/apache2filterapache_config.c 
  Log:
  Fixed bug #20217. When php_flag  php_value are used, the PHP_INI_PERDIR
  flag should be used when setting the ini value. Otherwise, the user cannot
  modify per-directory ini settings specified via .htaccess.
  
  
Index: php4/sapi/apache2filter/apache_config.c
diff -u php4/sapi/apache2filter/apache_config.c:1.26 
php4/sapi/apache2filter/apache_config.c:1.27
--- php4/sapi/apache2filter/apache_config.c:1.26Sat Nov  2 11:04:26 2002
+++ php4/sapi/apache2filter/apache_config.c Sat Nov  2 18:08:20 2002
 -16,7 +16,7 
+--+
  */
 
-/* $Id: apache_config.c,v 1.26 2002/11/02 16:04:26 imajes Exp $ */
+/* $Id: apache_config.c,v 1.27 2002/11/02 23:08:20 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
 -76,7 +76,7 
 static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, 
const char *name, const char *value)
 {
-   return real_value_hnd(cmd, dummy, name, value, PHP_INI_USER);
+   return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
 }
 
 static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy, 
 -103,7 +103,7 
 static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, 
const char *name, const char *value)
 {
-   return real_flag_hnd(cmd, dummy, name, value, PHP_INI_USER);
+   return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
 }
 
 static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy, 



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