mirror of
https://github.com/php/php-src.git
synced 2024-11-23 18:04:36 +08:00
- Fix typo (avaliable -> available). (bug #28725)
This commit is contained in:
parent
eb0c45d572
commit
ce742b08b0
@ -7995,13 +7995,13 @@
|
|||||||
2003-02-08 Ilia Alshanetsky <ilia@prohost.org>
|
2003-02-08 Ilia Alshanetsky <ilia@prohost.org>
|
||||||
|
|
||||||
* zend_builtin_functions.c:
|
* zend_builtin_functions.c:
|
||||||
The string.h is already avaliable through zend.h, so the manual inclusion
|
The string.h is already available through zend.h, so the manual inclusion
|
||||||
is not necessary.
|
is not necessary.
|
||||||
|
|
||||||
2003-02-07 Ilia Alshanetsky <ilia@prohost.org>
|
2003-02-07 Ilia Alshanetsky <ilia@prohost.org>
|
||||||
|
|
||||||
* zend_builtin_functions.c:
|
* zend_builtin_functions.c:
|
||||||
Added a check to ensure that string.h is avaliable before trying to use it.
|
Added a check to ensure that string.h is available before trying to use it.
|
||||||
|
|
||||||
Thanks Andi.
|
Thanks Andi.
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ gif --> gd1/gd2 conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ gif --> jpeg conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ gif --> png conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ imagefilter() function test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip this test requires bundled gd library.");
|
die("skip this test requires bundled gd library.");
|
||||||
|
@ -3,7 +3,7 @@ imagefttext() function test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!function_exists("imagefttext")) {
|
if (!function_exists("imagefttext")) {
|
||||||
die("skip imagefttext() not available.");
|
die("skip imagefttext() not available.");
|
||||||
|
@ -3,7 +3,7 @@ jpeg <--> png conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ jpeg <--> gd1/gd2 conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ png <--> gd1/gd2 conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ xbm --> png conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!function_exists("imagepng")) {
|
if (!function_exists("imagepng")) {
|
||||||
die("skip png support unavailable");
|
die("skip png support unavailable");
|
||||||
|
@ -3,7 +3,7 @@ xpm --> gd1/gd2 conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ xpm --> jpeg conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -3,7 +3,7 @@ xpm --> png conversion test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('gd')) {
|
if (!extension_loaded('gd')) {
|
||||||
die("skip gd extension not avaliable.");
|
die("skip gd extension not available.");
|
||||||
}
|
}
|
||||||
if (!GD_BUNDLED) {
|
if (!GD_BUNDLED) {
|
||||||
die("skip external GD libraries always fail");
|
die("skip external GD libraries always fail");
|
||||||
|
@ -497,7 +497,7 @@ EXEC SQL END DECLARE SECTION;
|
|||||||
int host_len = 0, user_len = 0, passwd_len = 0;
|
int host_len = 0, user_len = 0, passwd_len = 0;
|
||||||
host = user = passwd = NULL;
|
host = user = passwd = NULL;
|
||||||
|
|
||||||
/* set default values if any are avaliable */
|
/* set default values if any are available */
|
||||||
if (IFXG(default_host)) {
|
if (IFXG(default_host)) {
|
||||||
host = IFXG(default_host);
|
host = IFXG(default_host);
|
||||||
host_len = strlen(host);
|
host_len = strlen(host);
|
||||||
|
@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
|
|||||||
die("skip mb_send_mail() not available");
|
die("skip mb_send_mail() not available");
|
||||||
}
|
}
|
||||||
if (!@mb_internal_encoding('GB2312')) {
|
if (!@mb_internal_encoding('GB2312')) {
|
||||||
die("skip GB2312 encoding is not avaliable on this platform");
|
die("skip GB2312 encoding is not available on this platform");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--INI--
|
--INI--
|
||||||
|
@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
|
|||||||
die("skip mb_send_mail() not available");
|
die("skip mb_send_mail() not available");
|
||||||
}
|
}
|
||||||
if (!@mb_internal_encoding('BIG5')) {
|
if (!@mb_internal_encoding('BIG5')) {
|
||||||
die("skip BIG5 encoding is not avaliable on this platform");
|
die("skip BIG5 encoding is not available on this platform");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--INI--
|
--INI--
|
||||||
|
@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Korean")) {
|
|||||||
die("skip mb_send_mail() not available");
|
die("skip mb_send_mail() not available");
|
||||||
}
|
}
|
||||||
if (!@mb_internal_encoding('ISO-2022-KR')) {
|
if (!@mb_internal_encoding('ISO-2022-KR')) {
|
||||||
die("skip ISO-2022-KR encoding is not avaliable on this platform");
|
die("skip ISO-2022-KR encoding is not available on this platform");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--INI--
|
--INI--
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
if (!extension_loaded("mhash")) {
|
if (!extension_loaded("mhash")) {
|
||||||
die("skip mhash extension is not avaliable");
|
die("skip mhash extension is not available");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
@ -349,7 +349,7 @@ PHP_FUNCTION(mime_content_type)
|
|||||||
|
|
||||||
if (conf->magic == (struct magic *)-1) {
|
if (conf->magic == (struct magic *)-1) {
|
||||||
if(MIME_MAGIC_G(debug))
|
if(MIME_MAGIC_G(debug))
|
||||||
php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not avaliable", conf->magicfile);
|
php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not available", conf->magicfile);
|
||||||
RETURN_FALSE;
|
RETURN_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ Test pcntl wait functionality
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded("pcntl")) print "skip";
|
if (!extension_loaded("pcntl")) print "skip";
|
||||||
if (!function_exists("posix_kill")) print "skip posix_kill() not avaliable";
|
if (!function_exists("posix_kill")) print "skip posix_kill() not available";
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -4,7 +4,7 @@ pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3)
|
|||||||
<?php
|
<?php
|
||||||
if (!extension_loaded("pspell")) print "skip";
|
if (!extension_loaded("pspell")) print "skip";
|
||||||
if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
|
if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
|
||||||
die("skip English dictionary is not avaliable");
|
die("skip English dictionary is not available");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
|
@ -3,7 +3,7 @@ shmop extension test
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded("shmop")) {
|
if (!extension_loaded("shmop")) {
|
||||||
die("skip shmop() extension not avaliable");
|
die("skip shmop() extension not available");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
|
@ -3,7 +3,7 @@ GetImageSize() for compressed swf files
|
|||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
|
if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
|
||||||
die("skip zlib extension is not avaliable");
|
die("skip zlib extension is not available");
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/* Sanity check to ensure that pcre extension needed by this script is avaliable.
|
/* Sanity check to ensure that pcre extension needed by this script is available.
|
||||||
* In the event it is not, print a nice error message indicating that this script will
|
* In the event it is not, print a nice error message indicating that this script will
|
||||||
* not run without it.
|
* not run without it.
|
||||||
*/
|
*/
|
||||||
@ -708,7 +708,7 @@ TEST $file
|
|||||||
}
|
}
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
|
|
||||||
/* For GET/POST tests, check if cgi sapi is avaliable and if it is, use it. */
|
/* For GET/POST tests, check if cgi sapi is available and if it is, use it. */
|
||||||
if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
|
if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
|
||||||
if (file_exists("./sapi/cgi/php")) {
|
if (file_exists("./sapi/cgi/php")) {
|
||||||
$old_php = $php;
|
$old_php = $php;
|
||||||
|
@ -142,7 +142,7 @@ php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
|
|||||||
/*
|
/*
|
||||||
* This loop is needed because ap_get_brigade() can return us partial data
|
* This loop is needed because ap_get_brigade() can return us partial data
|
||||||
* which would cause premature termination of request read. Therefor we
|
* which would cause premature termination of request read. Therefor we
|
||||||
* need to make sure that if data is avaliable we fill the buffer completely.
|
* need to make sure that if data is available we fill the buffer completely.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {
|
while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {
|
||||||
|
Loading…
Reference in New Issue
Block a user