mirror of
https://github.com/php/php-src.git
synced 2024-09-21 09:57:23 +00:00
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: typofixes
This commit is contained in:
commit
56d02d564e
@ -2800,7 +2800,7 @@ AC_DEFUN([PHP_DETECT_ICC],
|
||||
|
||||
dnl PHP_DETECT_SUNCC
|
||||
dnl Detect if the systems default compiler is suncc.
|
||||
dnl We also set some usefull CFLAGS if the user didn't set any
|
||||
dnl We also set some useful CFLAGS if the user didn't set any
|
||||
AC_DEFUN([PHP_DETECT_SUNCC],[
|
||||
SUNCC="no"
|
||||
AC_MSG_CHECKING([for suncc])
|
||||
|
@ -9,7 +9,7 @@ Test eregi() function : basic functionality - confirm case insensitivity
|
||||
*/
|
||||
|
||||
/*
|
||||
* Test basic funtionality of eregi()
|
||||
* Test basic functionality of eregi()
|
||||
*/
|
||||
|
||||
echo "*** Testing eregi() : basic functionality ***\n";
|
||||
|
@ -382,7 +382,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* Only check if utf8 string is valid, and compute utf16 lenght */
|
||||
/* Only check if utf8 string is valid, and compute utf16 length */
|
||||
for (j=0 ; pos < len ; j++) {
|
||||
us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status);
|
||||
if (status != SUCCESS) {
|
||||
|
@ -1438,7 +1438,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
|
||||
No need to FREE_ALLOCA as we can reuse the
|
||||
'lengths' and 'fields' arrays. For lengths its absolutely safe.
|
||||
'fields' is reused because the ownership of the strings has been
|
||||
transfered above.
|
||||
transferred above.
|
||||
*/
|
||||
}
|
||||
/* Overflow ? */
|
||||
|
@ -5311,7 +5311,7 @@ by an auxiliary program - but can then be edited by hand if required. There are
|
||||
now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or
|
||||
toupper() in the code.
|
||||
|
||||
7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and
|
||||
7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and
|
||||
make them global. Abolish the function for setting them, as the caller can now
|
||||
set them directly.
|
||||
|
||||
|
@ -373,7 +373,7 @@ class Interop_Client
|
||||
}
|
||||
$soap =& $endpoint_info['client'];
|
||||
|
||||
# XXX how do we determine a failure on retreiving/parsing wsdl?
|
||||
# XXX how do we determine a failure on retrieving/parsing wsdl?
|
||||
if ($soap->wsdl->fault) {
|
||||
$fault = $soap->wsdl->fault;
|
||||
$soap_test->setResult(0,'WSDL',
|
||||
|
@ -326,7 +326,7 @@ PHP_FUNCTION(spl_autoload)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if (file_exts == NULL) { /* autoload_extensions is not intialzed, set to defaults */
|
||||
if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */
|
||||
copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1);
|
||||
} else {
|
||||
copy = pos1 = estrndup(file_exts, file_exts_len);
|
||||
|
@ -1,5 +1,5 @@
|
||||
--TEST--
|
||||
Test dirname() function : basic funtionality
|
||||
Test dirname() function : basic functionality
|
||||
--FILE--
|
||||
<?php
|
||||
/* Prototype: string dirname ( string $path );
|
||||
|
@ -266,7 +266,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
|
||||
p = s;
|
||||
} else {
|
||||
/* memrchr is a GNU specific extension
|
||||
Emulate for wide compatability */
|
||||
Emulate for wide compatibility */
|
||||
for(p = e; p >= s && *p != ':'; p--);
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) {
|
||||
|
||||
foreach($tested_functions as $tested_function) {
|
||||
|
||||
// go through method info array marking this funtion as tested
|
||||
// go through method info array marking this function as tested
|
||||
foreach($method_info as &$current_method_record) {
|
||||
if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) {
|
||||
// matched the method name
|
||||
|
@ -52,7 +52,7 @@ $conf = array(
|
||||
|
||||
/* file extension of pages requested via http
|
||||
this allows for php to be configured to parse
|
||||
extensions other than php, usefull for multiple
|
||||
extensions other than php, useful for multiple
|
||||
configurations under a single webserver */
|
||||
'TEST_WEB_EXT' => 'php',
|
||||
|
||||
|
@ -1521,7 +1521,7 @@ function output_as_table(header, ar_out)
|
||||
{
|
||||
var l = header.length;
|
||||
var cols = 80;
|
||||
var fixedlenght = "";
|
||||
var fixedlength = "";
|
||||
var t = 0;
|
||||
var i,j,k,m;
|
||||
var out = "| ";
|
||||
|
@ -5,7 +5,7 @@
|
||||
#endif
|
||||
|
||||
#define HOST_NAME_LEN 256
|
||||
#define MAX_APPNAME_LENGHT 100
|
||||
#define MAX_APPNAME_LENGTH 100
|
||||
#define MAIL_BUFFER_SIZE (1024*4) /* 4k buffer */
|
||||
/* Return values */
|
||||
#define MIN_ERROR_INDEX 0 /* Always 0 like SUCCESS */
|
||||
|
Loading…
Reference in New Issue
Block a user