Commit Graph

239 Commits

Author SHA1 Message Date
Hartmut Holzgraefe
cb6202bbe8 reverting accidential commit 2002-11-12 16:41:14 +00:00
Hartmut Holzgraefe
0c395d0f4c *** empty log message *** 2002-11-12 16:37: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
Derick Rethans
d82565fb7a - Fix build
#- Jan, please TEST! before committing :-)
2002-10-25 14:33:46 +00:00
Jan Lehnardt
ed29169f91 - alphabetcial output for php -h (cgi)
- cosmetics
2002-10-25 09:28:55 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Shane Caraveo
69f56e8c4a make fastcgi usage threadsafe, ready for future multithreaded fastcgi implementation
get rid of environment overwriting but hooking into php's environment function
set $_ENV correctly for mod_fastcgi
add -b to specify binding for fastcgi
new readme file with information for running under apache2.0 and iis
2002-10-13 09:40:44 +00:00
Zeev Suraski
d31604997b We leak quite a few things intentionally, if you want to debug it - enable
explicitly please..
2002-09-23 11:35:22 +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
Marcus Boerger
0b25d07f15 Fix headers when default content type is used.
#THIS fixes the problems with error_log()
2002-09-04 15:30:56 +00:00
Edin Kadribasic
1fb6a30f0f Debug functions should only work in debug mode. 2002-08-19 13:46:39 +00:00
Harald Radi
e84bddf76a dump memory leaks on shutdown 2002-08-07 18:16:44 +00:00
Sascha Schumann
2c3801b979 Generate content-type header, if the user did not specify one of its own.
Noticed by: Edin Kadribasic <edink@proventum.net>
2002-07-04 08:13:19 +00:00
Sascha Schumann
b3e562f9ef Add CRLF after complete HTTP reply header 2002-07-03 11:46:37 +00:00
Sascha Schumann
99cfb41da0 Use "Status: %d" instead of "HTTP/1.0 %d X" in the CGI SAPI module
as per the CGI RFC.

The status notation is incompatible with Apache's non-parsed-header mode
"nph-*", but that has never worked before anyway.  One could make the
format string configurable.

Noticed by: Sebastian Bergmann
2002-07-03 11:44:48 +00:00
Andi Gutmans
805a1653f0 - Revert WS changes 2002-06-22 13:59:13 +00:00
Andi Gutmans
85983fe957 - This shouldn't have snuck in. 2002-06-22 13:58:32 +00:00
Andi Gutmans
4216379152 - Stop using persist_alloc(). 2002-06-22 13:53:44 +00:00
Edin Kadribasic
2d953b348a Merge from cli. 2002-05-26 13:12:30 +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
Preston L. Bannister
57c5998ff9 Backed out preceding change. 2002-05-09 23:33:27 +00:00
Preston L. Bannister
d706e224ac Detect when running under IIS and default force_redirect to zero. This This means an explicit php.ini setting is no longer required.
(No extraneous whitespace changes this time :).
2002-05-09 21:03:30 +00:00
foobar
42c82bb40d Revert the last patches. 2002-05-09 20:03:36 +00:00
Preston L. Bannister
06f375b1cf Detect when running under IIS and not require explicit setting of force_redirect.
This means an explicit php.ini setting is no longer required.
2002-05-09 19:32:39 +00:00
Sander Roobol
7586cdc654 Added the current SAPI to the output of php -v 2002-05-09 09:36:45 +00:00
Sander Roobol
7a64b2b7e5 Fixed some minor typos 2002-05-02 17:19:42 +00:00
Sebastian Bergmann
edba077000 Fix build. 2002-05-02 15:18:26 +00:00
James Cox
ba85302e79 updated cgi warning notice. 2002-05-02 14:55:12 +00:00
Yasuo Ohgaki
439b56842f CGI/CLI take file and dir for -c option by this.
@ Both 'file' and 'path to php.ini' is allowed for "-c" cli/cgi option. (Yasuo)
2002-04-12 00:20:29 +00:00
Wez Furlong
abc5a2cacb fix quoting 2002-04-02 16:45:10 +00:00
James Cox
99a68d4f83 just did... 2002-04-02 01:35:45 +00:00
James Cox
f3d107a180 updated the alert sent to the browser. removed the verbosity, and linked to more info. 2002-04-02 01:34:15 +00:00
Shane Caraveo
c806dca62c add security impersonation feature for running under IIS security 2002-03-18 04:48:34 +00:00
Shane Caraveo
c8f5565bf3 woohoo, take some credit! 2002-03-10 22:08:09 +00:00
Shane Caraveo
f3a60dd1a6 children should be zero by default, enable by setting PHP_FCGI_CHILDREN env var. 2002-03-10 21:52:00 +00:00
Shane Caraveo
79bb884eec combine fastcgi capability with regular cgi binary
include fastcgi library for ease of windows builds
NOTE: included fastcgi library is modified for thread safety, but
	fastcgi support in cgi_main.c is only written for single
	threaded serving.  This does not present any issue for using
	fastcgi.
2002-03-10 21:39:28 +00:00
Derick Rethans
393cbe0ac3 - Put them back (and do it right) 2002-03-06 13:25:25 +00:00
Derick Rethans
c8740575c4 - Remove unused variables 2002-03-06 11:31:56 +00:00
Shane Caraveo
db73f90953 add comment for IIS users
fix some whitespace
2002-03-01 06:34:08 +00:00
Shane Caraveo
cd18533a10 This is much better. With FORCE_CGI_REDIRECT turned on by default for compilation,
we can now define this in the ini file.  So it can be turned on for apache, turned
off for IIS which does not have a redirect issue.  Alternately, a different 'REDIRECT_STATUS'
environment var can be defined in case some web server out there needs it.

new ini vars
cgi.force_redirect 0|1
cgi.redirect_status_env ENV_VAR_NAME
2002-03-01 01:58:20 +00:00
Shane Caraveo
e2b1161ea6 fix force redirect crash under multithreaded compile
should be discused: fix redirect detection to only work with apache or netscape,
where we know they set an environment variable regarding redirect.  IIS has
no security issue here.  Don't know about other windows web servers.
2002-03-01 00:19:01 +00:00
Derick Rethans
b8a5daf59c - Make the errorcode 255. (Doing docs right away) 2002-02-15 09:06:45 +00:00
Derick Rethans
86fa2d3937 - Let php_execute_script return 0 on failure and 1 on sucess, and change
SAPIs accordingly. (Andrei, Derick)
2002-02-14 20:16:08 +00:00
Sebastian Bergmann
dcd4e0a2ec Remove obsolete CG(extended_info) = 0 calls, we already do this in zend_set_default_compile_time_values(). 2002-02-02 19:53:43 +00:00
Edin Kadribasic
1769e3fcdc Fixed bug #9041 and others in the same class (patch by pete.lee@ubs.com) 2002-01-20 23:58:37 +00:00
Shane Caraveo
6120b8dc5a reimplement extension listing 2002-01-18 20:27:09 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Thies C. Arntzen
f026dae4f2 @- Added -w option to the cgi-version. This will remove all comments and
@  whitespace from teh script. (Thies)
2001-12-08 12:27:01 +00:00
Rui Hirokawa
975ed901aa fixed output problem with output buffering handler. 2001-11-11 23:11:23 +00:00
Alex Waugh
bddb9539f7 Convert PATH_TRANSLATED for RISC OS 2001-11-04 12:46:30 +00:00
Jeroen van Wolffelaar
eb38ca844b Undo Z_ subst for sapi and ext/yaz 2001-09-27 20:01:23 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Zeev Suraski
8021e65569 Revert an old bogus patch 2001-08-14 23:17:02 +00:00
Zeev Suraski
6ecae422c4 Use zend_first_try 2001-08-08 14:01:22 +00:00
Sascha Schumann
b349df6364 some more eliminate-fetches-or-escalate-them-at-least 2001-08-05 16:21:33 +00:00
Sascha Schumann
8aef193056 more tsrm cleanup 2001-08-05 15:29:47 +00:00
Thies C. Arntzen
578c395411 delay module_shutdown even further. zend_try and _catch need the current
globals as well.
zeev, is this a chicken & egg problem?
2001-08-05 14:07:33 +00:00
Thies C. Arntzen
0fe837b448 module_shutdown() calls ts_free_thread in ZTS mode. so SG() cannot be accessed
afterwards.
2001-08-05 14:04:23 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work
- whitespace fixes
2001-08-05 01:43:02 +00:00
Zeev Suraski
2ec440078a Get rid of a couple of bogus persist_alloc()'s, and some cleanup 2001-08-03 07:15:14 +00:00
Zeev Suraski
b1de7fc900 More TSRMLS_FETCH annihilation. Enough for today... 2001-07-31 07:09:49 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Thies C. Arntzen
b1cc3bd1d6 fix compile 2001-07-30 14:52:16 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Zeev Suraski
e280c3e555 Fix a corrupted memory access 2001-07-27 07:37:16 +00:00
Andi Gutmans
4715403906 - Fix __FILE__ in the main script in CGI/command line mode. 2001-07-21 15:11:30 +00:00
Zeev Suraski
336004f4bc Improved bailout mechanism, supports nested bailouts a-la try..catch
Note:  You may *not* return directly from a catch block
2001-07-21 14:27:56 +00:00
Zeev Suraski
85b4df53c0 Improved interactive mode - it is now available in all builds, without any significant slowdown 2001-07-15 14:08:58 +00:00
Zeev Suraski
551f1831a7 Fix a major thread safety bug in the output mechanism
@- Fixed a major memory corruption bug in the thread safe version (Zeev)
2001-07-02 18:17:10 +00:00
Zeev Suraski
8332ab409a Spit out errors 2001-06-21 14:18:23 +00:00
Sebastian Bergmann
49ab8cb8f1 Remove bogus '.'. 2001-06-06 13:24:17 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Shane Caraveo
f0b6b8ab52 The -c commandline option was not working at all, need to set the path
override before calling on the module startup.
2001-05-22 23:05:08 +00:00
Sascha Schumann
bc7a582f84 Use write(2), if we can successfully write to stdout. 2001-05-19 14:30:33 +00:00
Thies C. Arntzen
e80abfa40c revert parts of last commit - stupid me! 2001-05-18 14:40:02 +00:00
Thies C. Arntzen
2db3431f00 --enable-memory-usage-info id deprecated. use --enable-memory-limit instead! 2001-05-18 14:32:05 +00:00
Zeev Suraski
4afa93f716 @- Fixed a possible crash in the PHP CGI when no input file is
@  specified (Zeev)
Fixed bug 7822
2001-05-10 14:13:18 +00:00
Zeev Suraski
6cd3b987b8 $argc was off by one in -f (fix bug #9289) 2001-05-08 00:51:11 +00:00
Andi Gutmans
a166b6146b - Remove unused variable 2001-05-01 07:16:57 +00:00
Sterling Hughes
ba49860cc8 fix for bug 6491, http://www.php.net/bugs.php?id=6491, removes a bit of
(what I think is) broken logic.

#  This is as discussed on the mailing list previously.  This change
#  does fix the problem, however, the extra code was in there for a
#  reason (I'm guessing :), i'm ready to revert this patch in a jiffy
#  if someone has a good reason why that (just removed) extra logic
#  should be in there.
2001-05-01 03:48:27 +00:00
Andi Gutmans
6196e0bc4d - Fix for Bug id #10071
PR:
Submitted by:
Reviewed by:
Obtained from:
2001-04-30 22:47:51 +00:00
Andi Gutmans
4c823e8a89 - Change macros from V_ to VCWD_ because of AIX name clash 2001-04-30 12:45:02 +00:00
Stig Bakken
0b2641efa6 @Added -C command-line option to avoid chdir to the script's directory (Stig) 2001-04-16 23:20:47 +00:00
Ben Mansell
4549e389bb Fix a bug with POST requests. If the Content-Type header wasn't present,
we were setting SG(request_info).content_type to NULL, instead of
an empty string. This was stopping PHP from processing the data.
2001-03-22 18:54:51 +00:00
foobar
f4917d49c3 Fixed the help for other options too. 2001-03-07 13:24:12 +00:00
foobar
356fc41a0a Fix help text for -f 2001-03-05 15:08:36 +00:00
foobar
81a2669216 Can't output any error messages if there isn't any function initialized
to do it..
# Bug report: #7650
2001-03-05 01:26:36 +00:00
Zeev Suraski
ce39c56c8b whitespace fix 2001-03-04 01:08:46 +00:00
Andi Gutmans
a0d3c5a88e - Finally rename modules.h to zend_modules.h for consistency (first try
was 2000-03-11).
- Remove the first_arg_force_ref[]; and friends extern from php.h as they
  are included via zend_API.h
2001-02-26 18:14:50 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Sascha Schumann
adb3e3992c php_register_command_line_global_vars only needs file scope. 2001-02-24 21:07:07 +00:00
Sascha Schumann
280e10aac7 Neither the CGI nor the Servlet SAPI module call syslog, so remove
references to the syslog include files.
2001-02-24 21:05:02 +00:00
Sascha Schumann
c2fb53bed7 Finish fopen-wrappers rename. 2001-02-23 22:07:16 +00:00
Zeev Suraski
bd0ac7fe14 Many patches. I hope I remember them all:
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
  real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
  variables and read necessary variables at most once.
2001-01-02 22:49:31 +00:00