[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/cli/php_cli.c branches/PHP_5_4/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c
laruence Mon, 08 Aug 2011 07:12:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=314468
Log:
Prevented the warning about truncate int to char
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-08-08 06:49:17 UTC
(rev 314467)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-08-08 07:12:12 UTC
(rev 314468)
@@ -596,7 +596,7 @@
*/
static int cli_seek_file_begin(zend_file_handle *file_handle, char
*script_file, int *lineno TSRMLS_DC)
{
- char c;
+ int c;
*lineno = 1;
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-08-08 06:49:17 UTC
(rev 314467)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-08-08 07:12:12 UTC
(rev 314468)
@@ -615,7 +615,7 @@
*/
static int cli_seek_file_begin(zend_file_handle *file_handle, char
*script_file, int *lineno TSRMLS_DC)
{
- char c;
+ int c;
*lineno = 1;
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===
--- php/php-src/trunk/sapi/cli/php_cli.c2011-08-08 06:49:17 UTC (rev
314467)
+++ php/php-src/trunk/sapi/cli/php_cli.c2011-08-08 07:12:12 UTC (rev
314468)
@@ -615,7 +615,7 @@
*/
static int cli_seek_file_begin(zend_file_handle *file_handle, char
*script_file, int *lineno TSRMLS_DC)
{
- char c;
+ int c;
*lineno = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/cli/php_cli.c branches/PHP_5_4/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c
pajoye Sat, 25 Jun 2011 10:47:54 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312454
Log:
- reflection is always enabled
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC
(rev 312453)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-25 10:47:54 UTC
(rev 312454)
@@ -29,9 +29,7 @@
#include "zend_modules.h"
#include "zend_interfaces.h"
-#ifdef HAVE_REFLECTION
#include "ext/reflection/php_reflection.h"
-#endif
#include "SAPI.h"
@@ -159,14 +157,12 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
-#ifdef HAVE_REFLECTION
{10, 1, "rf"},
{10, 1, "rfunction"},
{11, 1, "rc"},
{11, 1, "rclass"},
{12, 1, "re"},
{12, 1, "rextension"},
-#endif
{13, 1, "ri"},
{13, 1, "rextinfo"},
{14, 0, "ini"},
@@ -519,11 +515,9 @@
"\n"
" --iniShow configuration file
names\n"
"\n"
-#if (HAVE_REFLECTION)
" --rf Show information about
function .\n"
" --rc Show information about
class .\n"
" --re Show information about
extension .\n"
-#endif
" --ri Show configuration for
extension .\n"
"\n"
, prog, prog, prog, prog, prog, prog);
@@ -1005,8 +999,6 @@
case 'H':
hide_argv = 1;
break;
-
-#ifdef HAVE_REFLECTION
case 10:
behavior=PHP_MODE_REFLECTION_FUNCTION;
reflection_what = php_optarg;
@@ -1019,7 +1011,6 @@
behavior=PHP_MODE_REFLECTION_EXTENSION;
reflection_what = php_optarg;
break;
-#endif
case 13:
behavior=PHP_MODE_REFLECTION_EXT_INFO;
reflection_what = php_optarg;
@@ -1285,7 +1276,6 @@
break;
}
-#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
@@ -1336,7 +1326,6 @@
break;
}
-#endif /* reflection */
case PHP_MODE_REFLECTION_EXT_INFO:
{
int len = strlen(reflection_what);
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC
(rev 312453)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 10:47:54 UTC
(rev 312454)
@@ -29,9 +29,7 @@
#include "zend_modules.h"
#include "zend_interfaces.h"
-#ifdef HAVE_REFLECTION
#include "ext/reflection/php_reflection.h"
-#endif
#include "SAPI.h"
@@ -158,7 +156,6 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
-#ifdef HAVE_REFLECTION
{10, 1, "rf"},
{10, 1, "rfunction"},
{11, 1, "rc"},
@@ -167,7 +164,6 @@
{12, 1, "rextension"},
{13, 1, "rz"},
{13, 1, "rzendextension"},
-#endif
{14, 1, "ri"},
{14, 1, "rextinfo"},
{15, 0, "ini"},
@@ -537,12 +533,10 @@
"\n"
" --iniShow configuration file
names\n"
"\n"
-#if (HAVE_REFLECTION)
" --rf Show information about
function .\n"
" --rc Show information about
class .\n"
" --re Show information about
extension .\n"
" --rz Show information about Zend
extension .\n"
-#endif
" --ri Show configuration for
extension .\n"
"\n"
, prog, prog, prog, prog, prog, prog);
@@ -873,8 +867,6 @@
case 'H':
hide_argv = 1;
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/cli/ php_cli.c
felipe Sat, 11 Jun 2011 23:46:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=312072
Log:
- Fix missing change from r303357 (related to bug #48831)
Bug: http://bugs.php.net/48831 (Assigned) php -i has different output to php
--ini
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-11 23:33:05 UTC
(rev 312071)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-11 23:46:35 UTC
(rev 312072)
@@ -1361,7 +1361,7 @@
{
zend_printf("Configuration File
(php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH);
zend_printf("Loaded Configuration File:
%s\n", php_ini_opened_path ? php_ini_opened_path : "(none)");
- zend_printf("Scan for additional .ini
files in: %s\n", *PHP_CONFIG_FILE_SCAN_DIR ? PHP_CONFIG_FILE_SCAN_DIR :
"(none)");
+ zend_printf("Scan for additional .ini
files in: %s\n", php_ini_scanned_path ? php_ini_scanned_path : "(none)");
zend_printf("Additional .ini files
parsed: %s\n", php_ini_scanned_files ? php_ini_scanned_files : "(none)");
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c
pajoye Wed, 02 Sep 2009 20:02:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=287973
Log:
- be sure to get all crt dbg errors in stderr
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2009-09-02 19:07:38 UTC
(rev 287972)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2009-09-02 20:02:17 UTC
(rev 287973)
@@ -672,10 +672,12 @@
#if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
{
int tmp_flag;
-
+ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===
--- php/php-src/trunk/sapi/cli/php_cli.c2009-09-02 19:07:38 UTC (rev
287972)
+++ php/php-src/trunk/sapi/cli/php_cli.c2009-09-02 20:02:17 UTC (rev
287973)
@@ -677,10 +677,12 @@
#if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
{
int tmp_flag;
-
+ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-
+ _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
