diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-21 20:35:43 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-21 20:35:43 +0000 |
| commit | e538fcbf10c6b15e064ab8dea9d205dc1ed458ea (patch) | |
| tree | 024e4a09bae23fcd5a5e17d2dc584832cb6c9bb7 | |
| parent | f0888ccaef222093c962eef72857e424f0fc5cb7 (diff) | |
| download | php-git-e538fcbf10c6b15e064ab8dea9d205dc1ed458ea.tar.gz | |
@- Fixed a bug in ODBC error reporting (Zeev)
@- Added PHP_Logo_GUID() and Zend_Logo_GUID() functions, that return the GUIDs
@ of the PHP and Zend logos used in phpinfo() (Zeev)
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/info.c | 12 | ||||
| -rw-r--r-- | ext/standard/info.h | 5 | ||||
| -rw-r--r-- | main/main.c | 4 |
5 files changed, 22 insertions, 3 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 29fa4724a3..b5e3165a4e 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -465,7 +465,7 @@ void ODBC_SQL_ERROR(HENV henv, HDBC conn, HSTMT stmt, char *func) ODBCLS_FETCH(); do { - SQLError(henv, conn, stmt, state, + ret = SQLError(henv, conn, stmt, state, &error, errormsg, sizeof(errormsg)-1, &errormsgsize); if (func) { php_error(E_WARNING, "SQL error: %s, SQL state %s in %s", diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 981de17212..a9246e8fc2 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -113,6 +113,8 @@ function_entry basic_functions[] = { PHP_FE(phpinfo, NULL) PHP_FE(phpversion, NULL) PHP_FE(phpcredits, NULL) + PHP_FE(php_logo_guid, NULL) + PHP_FE(zend_logo_guid, NULL) PHP_FE(strspn, NULL) PHP_FE(strcspn, NULL) diff --git a/ext/standard/info.c b/ext/standard/info.c index 69a9d2791c..2933482006 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -510,6 +510,18 @@ PHP_FUNCTION(phpcredits) /* }}} */ + +PHP_FUNCTION(php_logo_guid) +{ + RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1); +} + + +PHP_FUNCTION(zend_logo_guid) +{ + RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1); +} + /* * Local variables: * tab-width: 4 diff --git a/ext/standard/info.h b/ext/standard/info.h index 627accf213..72aadf72ee 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -52,9 +52,14 @@ #define PHP_CREDITS_FULLPAGE (1<<3) #define PHP_CREDITS_ALL 0xFFFFFFFF +#define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42" +#define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42" + PHP_FUNCTION(phpversion); PHP_FUNCTION(phpinfo); PHP_FUNCTION(phpcredits); +PHP_FUNCTION(php_logo_guid); +PHP_FUNCTION(zend_logo_guid); PHPAPI void php_print_info(int flag); PHPAPI void php_print_credits(int flag); diff --git a/main/main.c b/main/main.c index e2ba3fb2d0..62cd683dc0 100644 --- a/main/main.c +++ b/main/main.c @@ -1224,13 +1224,13 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_ if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' && PG(expose_php)) { - if (!strcmp(SG(request_info).query_string+1, "PHPE9568F34-D428-11d2-A769-00AA001ACF42")) { + if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) { char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)); php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1); PHPWRITE(php4_logo, sizeof(php4_logo)); return; - } else if (!strcmp(SG(request_info).query_string+1, "PHPE9568F35-D428-11d2-A769-00AA001ACF42")) { + } else if (!strcmp(SG(request_info).query_string+1, ZEND_LOGO_GUID)) { char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)); php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1); |