From 144eab0889c086bc31226bad98be9ce04d231f8a Mon Sep 17 00:00:00 2001
From: Veres Lajos <vlajos@gmail.com>
Date: Wed, 24 Jul 2013 00:54:16 +0100
Subject: [PATCH] code related typo fixes

---
 ext/odbc/config.m4             |  2 +-
 ext/standard/basic_functions.c |  4 ++--
 ext/standard/math.c            |  2 +-
 ext/xml/compat.c               | 10 +++++-----
 ext/xml/expat_compat.h         |  5 ++++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 14ec97bf364..b463d34b0be 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -359,7 +359,7 @@ PHP_ARG_WITH(custom-odbc,,
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
     AC_DEFINE(HAVE_CODBC,1,[ ])
-    AC_MSG_RESULT([$ext_ouput])
+    AC_MSG_RESULT([$ext_output])
   fi
 fi
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9c91404eff0..eca7d903680 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1789,8 +1789,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_number_format, 0, 0, 1)
 	ZEND_ARG_INFO(0, number)
 	ZEND_ARG_INFO(0, num_decimal_places)
-	ZEND_ARG_INFO(0, dec_seperator)
-	ZEND_ARG_INFO(0, thousands_seperator)
+	ZEND_ARG_INFO(0, dec_separator)
+	ZEND_ARG_INFO(0, thousands_separator)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_fmod, 0)
diff --git a/ext/standard/math.c b/ext/standard/math.c
index be2d655263f..f6b3d5406eb 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1226,7 +1226,7 @@ PHPAPI char *_php_math_number_format_ex(double d, int dec, char *dec_point,
 }
 /* }}} */
 
-/* {{{ proto string number_format(float number [, int num_decimal_places [, string dec_seperator, string thousands_seperator]])
+/* {{{ proto string number_format(float number [, int num_decimal_places [, string dec_separator, string thousands_separator]])
    Formats a number with grouped thousands */
 PHP_FUNCTION(number_format)
 {
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index fbebb635eeb..902365e6612 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -39,7 +39,7 @@ _qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, x
 	if (URI) {
 			/* Use libxml functions otherwise its memory deallocation is screwed up */
 			*qualified = xmlStrdup(URI);
-			*qualified = xmlStrncat(*qualified, parser->_ns_seperator, 1);
+			*qualified = xmlStrncat(*qualified, parser->_ns_separator, 1);
 			*qualified = xmlStrncat(*qualified, name, xmlStrlen(name));
 	} else {
 		*qualified = xmlStrdup(name);
@@ -469,7 +469,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 	parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser));
 	memset(parser, 0, sizeof(struct _XML_Parser));
 	parser->use_namespace = 0;
-	parser->_ns_seperator = NULL;
+	parser->_ns_separator = NULL;
 
 	parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL);
 	if (parser->parser == NULL) {
@@ -491,7 +491,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 	if (sep != NULL) {
 		parser->use_namespace = 1;
 		parser->parser->sax2 = 1;
-		parser->_ns_seperator = xmlStrdup(sep);
+		parser->_ns_separator = xmlStrdup(sep);
 	} else {
 		/* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt 
 		so must be set in the handlers */
@@ -770,8 +770,8 @@ PHPAPI void
 XML_ParserFree(XML_Parser parser)
 {
 	if (parser->use_namespace) {
-		if (parser->_ns_seperator) {
-			xmlFree(parser->_ns_seperator);
+		if (parser->_ns_separator) {
+			xmlFree(parser->_ns_separator);
 		}
 	}
 	if (parser->parser->myDoc) {
diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
index 424785f566f..1c94e45fd3e 100644
--- a/ext/xml/expat_compat.h
+++ b/ext/xml/expat_compat.h
@@ -38,6 +38,9 @@
 #include <libxml/tree.h>
 #include <libxml/hash.h>
 
+/* For compatibility with the misspelled version. */
+#define _ns_seperator _ns_separator
+
 typedef xmlChar XML_Char;
 
 typedef void (*XML_StartElementHandler)(void *, const XML_Char *, const XML_Char **);
@@ -61,7 +64,7 @@ typedef struct _XML_Memory_Handling_Suite {
 typedef struct _XML_Parser {
 	int use_namespace;
 
-	xmlChar *_ns_seperator;
+	xmlChar *_ns_separator;
 
 	void *user;
 	xmlParserCtxtPtr parser;