- modifyable -> modifiable

diff --git a/Zend/OBJECTS2_HOWTO b/Zend/OBJECTS2_HOWTO
index aef370330d58fc28a1111049fc8e9dff3f42d0e2..302d1e9087b53a1daf6967884dc6fa6c9ce4cd8b 100644 (file)
--- a/Zend/OBJECTS2_HOWTO
+++ b/Zend/OBJECTS2_HOWTO
@@ -51,7 +51,7 @@ write_property is used to directly write object's property by
 name.  This handler is used to assign property variables or to change them 
 in operations like += or ++ (unless get_property_zval_ptr is also set).
 
-get_property_zval_ptr is used to obtain pointer to modifyable zval for 
+get_property_zval_ptr is used to obtain pointer to modifiable zval for 
 operations like += or ++. This should be used only if your object model 
 stores properties as real zval's that can be modified from outside. 
 Otherwise this handler should be NULL and the engine will use 

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 64d3ea4650fa5b7640812af03d421db9dc850964..35fdb0048d8523d6591c5fa99a305f1a52b3370e 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -24,7 +24,7 @@
 
 #include "zend_compile.h"
 
-#define ZEND_EXTENSION_API_NO  90021012
+#define ZEND_EXTENSION_API_NO  90040412
 
 typedef struct _zend_extension_version_info {
        int zend_extension_api_no;

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 50f895b502e3c8fdba80ba1f6f796359eea0af03..5128a0f8a4357038a295b580250b73675cf003c2 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -202,7 +202,7 @@ ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value,
                return FAILURE;
        }
 
-       if (!(ini_entry->modifyable & modify_type)) {
+       if (!(ini_entry->modifiable & modify_type)) {
                return FAILURE;
        }
 

diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index ff37fd3a56fc3a778b0abfdb846eef91832c25dd..1eb97b6666ef78fbe7bcea5fa2269ff14b7c726f 100644 (file)
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -64,7 +64,7 @@ typedef struct _zend_ini_entry zend_ini_entry;
 
 struct _zend_ini_entry {
        int module_number;
-       int modifyable;
+       int modifiable;
        char *name;
        uint name_length;
        ZEND_INI_MH((*on_modify));
@@ -113,44 +113,44 @@ END_EXTERN_C()
 #define ZEND_INI_BEGIN()               static zend_ini_entry ini_entries[] = {
 #define ZEND_INI_END()         { 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };
 
-#define ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, displayer) \
-       { 0, modifyable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, displayer },
+#define ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, arg3, displayer) \
+       { 0, modifiable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, displayer },
 
-#define ZEND_INI_ENTRY3(name, default_value, modifyable, on_modify, arg1, arg2, arg3) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, NULL)
+#define ZEND_INI_ENTRY3(name, default_value, modifiable, on_modify, arg1, arg2, arg3) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, arg3, NULL)
 
-#define ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, displayer) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL, displayer)
+#define ZEND_INI_ENTRY2_EX(name, default_value, modifiable, on_modify, arg1, arg2, displayer) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, NULL, displayer)
 
-#define ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, arg1, arg2) \
-       ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL)
+#define ZEND_INI_ENTRY2(name, default_value, modifiable, on_modify, arg1, arg2) \
+       ZEND_INI_ENTRY2_EX(name, default_value, modifiable, on_modify, arg1, arg2, NULL)
 
-#define ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, displayer) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, NULL, NULL, displayer)
+#define ZEND_INI_ENTRY1_EX(name, default_value, modifiable, on_modify, arg1, displayer) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, NULL, NULL, displayer)
 
-#define ZEND_INI_ENTRY1(name, default_value, modifyable, on_modify, arg1) \
-       ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, NULL)
+#define ZEND_INI_ENTRY1(name, default_value, modifiable, on_modify, arg1) \
+       ZEND_INI_ENTRY1_EX(name, default_value, modifiable, on_modify, arg1, NULL)
        
-#define ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, displayer) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, NULL, NULL, NULL, displayer)
+#define ZEND_INI_ENTRY_EX(name, default_value, modifiable, on_modify, displayer) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, NULL, NULL, NULL, displayer)
 
-#define ZEND_INI_ENTRY(name, default_value, modifyable, on_modify) \
-       ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, NULL)
+#define ZEND_INI_ENTRY(name, default_value, modifiable, on_modify) \
+       ZEND_INI_ENTRY_EX(name, default_value, modifiable, on_modify, NULL)
 
 #ifdef ZTS
-#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-       ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id)
-#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
-       ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, displayer)
-#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, NULL, zend_ini_boolean_displayer_cb)
+#define STD_ZEND_INI_ENTRY(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr) \
+       ZEND_INI_ENTRY2(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id)
+#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr, displayer) \
+       ZEND_INI_ENTRY2_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, displayer)
+#define STD_ZEND_INI_BOOLEAN(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, NULL, zend_ini_boolean_displayer_cb)
 #else
-#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-       ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr)
-#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
-       ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, displayer)
-#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-       ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
+#define STD_ZEND_INI_ENTRY(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr) \
+       ZEND_INI_ENTRY2(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr)
+#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr, displayer) \
+       ZEND_INI_ENTRY2_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, displayer)
+#define STD_ZEND_INI_BOOLEAN(name, default_value, modifiable, on_modify, property_name, struct_type, struct_ptr) \
+       ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
 #endif
 
 #define INI_INT(name) zend_ini_long((name), sizeof(name), 0)

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 065a058900087a73744062d88902210609d26fec..536269eb958c795fb164c233a8afdfd0c9853962 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -37,7 +37,7 @@ extern struct _zend_arg_info third_arg_force_ref[4];
 extern struct _zend_arg_info fourth_arg_force_ref[5];
 extern struct _zend_arg_info all_args_by_ref[1];
 
-#define ZEND_MODULE_API_NO 20040316
+#define ZEND_MODULE_API_NO 20040412
 #ifdef ZTS
 #define USING_ZTS 1
 #else

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 0937296c098febdf859e5ad656900a646df990fc..18d799fdd37dd0f8c56829cb21c3356035cb9066 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2405,7 +2405,7 @@ static int php_ini_get_option(zend_ini_entry *ini_entry, int num_args, va_list a
                        add_assoc_null(option, "local_value");
                }
 
-               add_assoc_long(option, "access", ini_entry->modifyable);
+               add_assoc_long(option, "access", ini_entry->modifiable);
 
                add_assoc_zval_ex(ini_array, ini_entry->name, ini_entry->name_length, option);
        }