Commit Graph

185 Commits

Author SHA1 Message Date
Ilia Alshanetsky
98d998b7ee Fixed bug #20896 (-s -w modes with php-cli cause php to hang). 2003-08-13 01:29:51 +00:00
Ilia Alshanetsky
3253746c26 Preserve exit status for non-php execution modes. 2003-08-01 16:52:49 +00:00
Ilia Alshanetsky
68616d764c Fixed bug #23509 (exit code lost when exit() called from
register_shutdown_function())
2003-08-01 12:26:28 +00:00
Stanislav Malyshev
7e663790c7 flush after banner print 2003-06-16 16:14:38 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Derick Rethans
814f793035 - MFB: Version output beautification 2003-05-30 16:10:58 +00:00
Marcus Boerger
6ddd6ca2be MFB 2003-05-30 00:11:37 +00:00
Marcus Boerger
1aebe79599 Simply print errors 2003-05-29 14:45:03 +00:00
Marcus Boerger
a93bff54ef Update 2003-05-29 14:26:57 +00:00
Derick Rethans
87a85db670 - MFB 2003-05-26 18:37:48 +00:00
Derick Rethans
7b26ddd9b0 -Fix notice 2003-05-21 18:41:28 +00:00
Edin Kadribasic
43e54bf2c1 More clean way of ignoring headers in CLI since we do not need to
disable them selectively. This fixes problems for people who want
to use session module in CLI.
2003-04-28 10:04:50 +00:00
Marcus Boerger
1c1aa38ee5 Reset option parsing
# i swear i had them in before last commit
2003-04-27 19:41:36 +00:00
Marcus Boerger
129d0898ca split parameter parsing once more: do informal queries before others
#still a memleak in case of a parameter conflict
2003-04-27 19:19:29 +00:00
Marcus Boerger
d2833dc9c2 Revert some ini settings to be hardcoded due to popular demand 2003-04-23 22:52:44 +00:00
Marcus Boerger
de76ceb2d3 Fix more shutdown wierdness 2003-04-19 15:02:44 +00:00
Wez Furlong
7ca29424c4 Fix folding marker 2003-04-19 14:41:31 +00:00
Marcus Boerger
0bcfdd0262 Do init CG(in_compilation) here until someone finds a better place 2003-04-19 13:54:01 +00:00
Marcus Boerger
1b3467e72d Shutdown memleaks 2003-04-19 00:02:50 +00:00
foobar
2170ea8b4d Added missing CVS Id tags 2003-04-16 02:34:57 +00:00
Marcus Boerger
bb0f885d51 Hopefully last fix on error reporting 2003-04-09 00:38:19 +00:00
Marcus Boerger
7aa1e2cda4 more ini defaults for error message handling 2003-03-30 14:00:09 +00:00
Marcus Boerger
06a0e1c112 simplify and fix 2003-03-30 11:07:36 +00:00
Marcus Boerger
ac3113122a done 2003-03-30 10:56:34 +00:00
Marcus Boerger
c21f2b7493 use sizeof() as suggested by Andrei 2003-03-29 21:23:53 +00:00
Derick Rethans
fa59090287 - html errors should default to off (0) in CLI 2003-03-29 20:57:31 +00:00
Sebastian Bergmann
5ca078779a Eliminate some TSRMLS_FETCH() calls. Tested with Win32 build of SAPI/CGI and SAPI/CLI on Win32. 2003-03-25 08:07:13 +00:00
Marcus Boerger
58df04af27 - reenable $argc/$argv
- add a comment where hardcoded defaults would go
# i believe we have none for now though
2003-03-19 20:36:04 +00:00
Marcus Boerger
3e621fac94 make phpinfo() depend on executed sapi 2003-03-18 20:52:52 +00:00
Marcus Boerger
b21fdb762a use new callback to overwrite ini settings
# ok now lets split html_errors and phpinfo() formatting
2003-03-18 15:56:12 +00:00
Marcus Boerger
3ac6bb5017 remove entry done already 2003-03-03 00:15:50 +00:00
Marcus Boerger
d4fd1c07b1 - Allow long option names
- Update CLI's manpage

@Added support for long options in CLI & CGI (e.g. --version). (Marcus)

# In contrast to the preliminary patch this should work now completely.
# If all long option names are accepted we may even think about MFHing.
2003-02-16 01:23:11 +00:00
Marcus Boerger
ecaeb3004a fix parameter string (-R & -H) 2003-02-15 15:20:17 +00:00
foobar
7788cefdd3 "Generate" the man page so that it gets correct version always. 2003-02-12 04:38:30 +00:00
foobar
5896410c81 - Added the man page installation 2003-02-12 04:04:36 +00:00
Marcus Boerger
c681320471 Make that clear 2003-02-11 20:34:24 +00:00
Marcus Boerger
7fec2a3856 Document -H added by Ilia 2003-02-11 20:31:34 +00:00
Ilia Alshanetsky
f3ac7fc9c6 Added -H option to CLI binary. This option can be used to hide any arguments
including the script name passed to the CLI binary.
2003-02-11 16:18:42 +00:00
Marcus Boerger
0bce257947 Style corrections
See also: Stig's intro
Version info
2003-02-08 15:29:35 +00:00
Marcus Boerger
9e780033c2 Adding some text and some backslashes which are needed sometimes
somewhere...
2003-02-07 22:12:02 +00:00
Marcus Boerger
383aa3c2d1 Define STDIN/OUT/ERR for -B -R -F -E (works as expected).
Enable exit in same switches.
2003-02-07 21:55:51 +00:00
Marcus Boerger
598e82751d No more maximum line size for -R and -F 2003-02-07 20:53:05 +00:00
Marcus Boerger
fb44f1e0fb Rewrite/add some stuff 2003-02-06 20:10:52 +00:00
Marcus Boerger
ad7facdf2b # RTFM .. and then it goes better :-) 2003-02-05 00:35:20 +00:00
Marcus Boerger
c1f0159d63 First step - abrief version.
@Added man page for CLI version of PHP. (marcus)
# I was also thinking about an author section with
# The PHP Group, Edin Kadribasic, Marcus Boerger, Rasmus Lerdorf,
# Stig Bakken and Zeev Suraski beeing mentioned. Group of corse and
# the rest is listed in php_cli.c.
2003-02-05 00:12:46 +00:00
Marcus Boerger
afc673b61d remove it then....this forces to put work in man page ... 2003-02-04 20:52:13 +00:00
Sebastian Bergmann
b4cfff0403 Fix ZTS build. 2003-02-03 07:41:05 +00:00
Marcus Boerger
63d4f31604 - Added -B, -F, -R, -E for line by line std in processing.
- Added some error messages.
- Added more -h info.
@Added command line parameters -B, -F, -R and -E which allow to process
@stdin line by line (See php -h for more). (marcus)
#This allows to simply complex command line constructs...
2003-02-03 00:22:28 +00:00
Ilia Alshanetsky
973937e7aa Fix the line numbering when the 1st line in the script is #!. 2003-01-11 00:20:50 +00:00
Ilia Alshanetsky
5de9962d50 Fixed bug #21297. The fix also fixes miscalculation of lines numbers by 1
due the previously mentioned bug.
2003-01-08 00:41:53 +00:00
Zeev Suraski
19d47d9f6e Initialize lineno using the new infrastructure 2003-01-05 16:10:35 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
Moriyoshi Koizumi
740ee5df1c Recommited the patch 2002-12-20 15:51:35 +00:00
Edin Kadribasic
3c94150191 MFB: Make sure cli install dir is created before trying to install in it. 2002-12-20 10:12:15 +00:00
Edin Kadribasic
ff54f76f71 MFB: Reverted previous patches as suggested by Andi. 2002-12-19 00:13:43 +00:00
Edin Kadribasic
f84aff8f5c Fix for #20539 (patch by Moriyoshi Koizumi). 2002-12-11 10:24:02 +00:00
Melvyn Sopacua
2421e79b60 Fix make install target on Cygwin, bug #20807 2002-12-09 17:02:38 +00:00
Sebastian Bergmann
ba5764ab39 Fix build. 2002-12-09 11:45:46 +00:00
Moriyoshi Koizumi
93ee146d0e Fixed stream leaks 2002-12-08 10:23:50 +00:00
foobar
dd53efc196 - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. 2002-11-26 05:57:06 +00:00
Andrei Zmievski
e09d62c435 Sort the modules and extensions before printing them when -m switch is used. 2002-11-14 20:32:28 +00:00
Sascha Schumann
46a99e9022 - Remove PHP_DISABLE_CLI
- Streamline ircg build: thttpd-dependent part moved into separate source
  file, so that it can be added to the SAPI-only object list.
2002-11-14 01:09:46 +00:00
Jan Lehnardt
e95c7178cc - be more verbose 2002-11-13 12:41:05 +00:00
Marcus Boerger
cecb9dfc79 Implemented -n switch to skip parsing ini at startup as suggested by Wez.
#The switch 'n' was planned to be used for beautifying....delete n to make
#clear these functions do not have a switch yet.
2002-11-12 20:56:47 +00:00
Ilia Alshanetsky
64f77577f0 Fixed bug #20035. ZE now allows us to pass the current line position by
setting zend_lineno to (current_line * -1).
2002-11-05 22:04:12 +00:00
Marcus Boerger
64d3e88266 call php_module_startup after zts has been initialised. This way we could
have called zend_ini_deactivate(TSRMLS_C). But it seems unnecessary.
#tested with ZTS and non ZTS build and many manual fail points.
#now it even compiles without any warning, at least for me
2002-11-05 15:15:51 +00:00
Edin Kadribasic
9276b276f7 Made php -v output look nicer on standard 80 column display. 2002-11-05 11:13:35 +00:00
foobar
b79e506045 Added built date and time to -v output. 2002-10-31 17:34:10 +00:00
Ilia Alshanetsky
3a1c278361 Fixed memory leaks. 2002-10-26 19:33:15 +00:00
Jan Lehnardt
e431d6a1c9 - alphabetical output for php -h (cli) 2002-10-25 09:32:32 +00:00
Sascha Schumann
d464b8164c add missing {} 2002-10-24 16:04:31 +00:00
Derick Rethans
1f9f9244eb - whitespace 2002-10-24 14:01:39 +00:00
Sascha Schumann
1e3e07173b Improve shutdown-behaviour
Noticed by: Anantha Kesari H Y
2002-10-24 13:25:57 +00:00
Derick Rethans
337649a5f2 *** empty log message *** 2002-10-24 13:18:27 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Yasuo Ohgaki
d253364a13 Make CLI behave like other moder scripting languages. 2002-10-23 01:21:40 +00:00
Derick Rethans
1bb702e403 - Revert, got tricked by a stale object file 2002-10-14 11:59:58 +00:00
Derick Rethans
092f78fc28 - Fix CLI 2002-10-14 06:58:57 +00:00
Derick Rethans
9b517c4b93 - Revert changed to implicit_flush behavior. The new behavior was not
intended in the first place.
2002-10-03 10:35:33 +00:00
Yasuo Ohgaki
b52edbddf9 Shouldn't enable implicit_flush like this.
Most problems are fixed. If you find internal function that does
not follow my comment, please fix it or let me know.
2002-10-03 09:57:53 +00:00
Sascha Schumann
e6e54605b7 Follow Yasuo's suggestion and build sapi program's under the sapi-specific
directory.

Move sapi-specific makefile fragments to their respective directory.

Create an embed sapi module which resides in its own dir now.
2002-09-29 16:22:49 +00:00
Edin Kadribasic
4be735db9e Those two have enough credits already :) 2002-09-27 12:15:13 +00:00
Zeev Suraski
76312b4508 another startup initialization fix - only ISAPI and CGI SAPI's tested,
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
2002-09-18 21:57:42 +00:00
Jan Lehnardt
298ae37e8c - prepare non-html phpinfo output for zend extensions 2002-09-02 20:44:01 +00:00
Marcus Boerger
8e7acaca47 change order of initialisation to allow making filename available
through $_SERVER variables (Bug #18657)
2002-08-10 22:42:38 +00:00
Marko Karppinen
6d80c191bb The link lines don't need any of $DEFS, $INCLUDES, $EXTRA_INCLUDES or
$CPPFLAGS, right? Removed them. Added frameworks to $COMMON_FLAGS.
2002-08-06 17:51:24 +00:00
Marko Karppinen
5611c2fc78 Support compiling and linking against Darwin / Mac OS X frameworks 2002-08-06 16:01:34 +00:00
Marko Karppinen
b231fc0d35 Made PHP_ADD_LIBPATH use the $ld_runpath_switch and changed the Darwin
link lines in sapi/cli and sapi/cgi to use $NATIVE_RPATHS.
This is a tentative fix for #18450.
2002-07-21 14:42:01 +00:00
foobar
6a42e635ca Needed this to be able to test safe-mode stuff on cmd-line 2002-07-13 04:43:12 +00:00
Marko Karppinen
23de5d1c20 - You don't need libtool to build sapi/cli on Darwin.
- We don't need libtool to build sapi/cli on Darwin.
- You want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- We want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- He can go about his business.
- You can go about your business.
- Move along.
- Move along. Move along.
2002-07-01 21:17:39 +00:00
Edin Kadribasic
11bc56d48b Fix exit code (bug #17733). 2002-06-13 08:38:26 +00:00
Edin Kadribasic
acae873a6b Disable installing pear when --disable-cli is used since pear installer
needs cli to function.
2002-06-11 09:35:59 +00:00
Edin Kadribasic
af5663fa50 Due to the way Zend handles exit() we cannot rely on the return code
of php_execute_script.
2002-05-26 12:43:20 +00:00
Edin Kadribasic
190719ab97 Made constants persistent and fixed a memory leak. 2002-05-26 12:20:35 +00:00
Edin Kadribasic
1501657b2f Register STDIN, STDOUT, and STDERR "constants" in cli in cases where
script itself is not being loaded from STDIN.

This enables constructs like fwrite(STDERR, "Error 42");
2002-05-24 01:17:37 +00:00
Markus Fischer
965b4c26f1 - Update about CLI default settings and it's weirdness. 2002-05-11 20:33:59 +00:00
Edin Kadribasic
8e15de012a Added copyright notice to php -v output. 2002-05-11 14:26:30 +00:00
Zeev Suraski
5af649efbd Revert to the old php_ini.c, and reimplement the binary-path searching.
Should now also work under UNIX (CLI/CGI)
2002-05-11 03:41:17 +00:00
Markus Fischer
ccbadfc111 - Prefix the first version line with 'PHP' so it's easier to use shell tools to
parse the version number (both CLI and CGI).
2002-05-10 16:18:00 +00:00
Markus Fischer
bf351e9639 - This affects both CGI and CLI sapi:
Remove Zend version output from -m switch and move it over to the output of
  the -v switch (-v is supposed to list version numbers, not -m).
2002-05-10 16:04:03 +00:00