iliaa Wed Apr 6 10:21:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
MFH: Removed php_check_syntax() function, it never worked properly. For now
use shell_exec("php -l script_name") or similar.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.312&r2=1.1760.2.313&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.312 php-src/NEWS:1.1760.2.313
--- php-src/NEWS:1.1760.2.312 Wed Apr 6 09:59:48 2005
+++ php-src/NEWS Wed Apr 6 10:21:02 2005
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.0.5
+- Removed php_check_syntax() function, never worked properly. (Ilia)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
(Ilia)
- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.673.2.13&r2=1.673.2.14&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.673.2.13
php-src/ext/standard/basic_functions.c:1.673.2.14
--- php-src/ext/standard/basic_functions.c:1.673.2.13 Thu Mar 10 07:10:57 2005
+++ php-src/ext/standard/basic_functions.c Wed Apr 6 10:21:02 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.673.2.13 2005/03/10 12:10:57 hyanantha Exp $ */
+/* $Id: basic_functions.c,v 1.673.2.14 2005/04/06 14:21:02 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -469,7 +469,6 @@
PHP_FALIAS(show_source, highlight_file,
NULL)
PHP_FE(highlight_string,
NULL)
PHP_FE(php_strip_whitespace,
NULL)
- PHP_FE(php_check_syntax,
second_arg_force_ref)
PHP_FE(ini_get,
NULL)
PHP_FE(ini_get_all,
NULL)
@@ -2323,49 +2322,6 @@
}
/* }}} */
-/* {{{ proto bool php_check_syntax(string file_name [, &$error_message])
- Check the syntax of the specified file. */
-PHP_FUNCTION(php_check_syntax)
-{
- char *filename;
- int filename_len;
- zval *errm=NULL;
- zend_file_handle file_handle = {0};
-
- int old_errors = PG(display_errors);
- int log_errors = PG(log_errors);
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &filename,
&filename_len, &errm) == FAILURE) {
- RETURN_FALSE;
- }
-
- file_handle.type = ZEND_HANDLE_FILENAME;
- file_handle.filename = filename;
- file_handle.free_filename = 0;
- file_handle.opened_path = NULL;
-
- PG(log_errors) = PG(display_errors) = 0;
-
- if (php_lint_script(&file_handle TSRMLS_CC) != SUCCESS) {
- if (errm) {
- char *error_str;
-
- zval_dtor(errm);
- spprintf(&error_str, 0, "%s in %s on line %d",
PG(last_error_message), PG(last_error_file), PG(last_error_lineno));
- ZVAL_STRING(errm, error_str, 0);
- }
- RETVAL_FALSE;
- } else {
- RETVAL_TRUE;
- }
-
- PG(display_errors) = old_errors;
- PG(log_errors) = log_errors;
-
- return;
-}
-/* }}} */
-
/* {{{ proto bool highlight_string(string string [, bool return] )
Syntax highlight a string or optionally return it */
PHP_FUNCTION(highlight_string)
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.h?r1=1.133&r2=1.133.2.1&ty=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.133
php-src/ext/standard/basic_functions.h:1.133.2.1
--- php-src/ext/standard/basic_functions.h:1.133 Fri Mar 26 19:50:39 2004
+++ php-src/ext/standard/basic_functions.h Wed Apr 6 10:21:03 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.133 2004/03/27 00:50:39 helly Exp $ */
+/* $Id: basic_functions.h,v 1.133.2.1 2005/04/06 14:21:03 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -82,7 +82,6 @@
PHP_FUNCTION(highlight_file);
PHP_FUNCTION(highlight_string);
PHP_FUNCTION(php_strip_whitespace);
-PHP_FUNCTION(php_check_syntax);
ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini
*syntax_highlighter_ini);
PHP_FUNCTION(ini_get);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
