Commit Graph

1389 Commits

Author SHA1 Message Date
Sascha Schumann
f866bdc368 Simplify even more 2002-05-12 15:30:44 +00:00
Sascha Schumann
5c4ae13670 Simplify white space handling in php_html_puts.
If we encounter a ' ', we will look for the next non-' ' and set p
accordingly.
2002-05-12 15:22:11 +00:00
Sascha Schumann
a769454d79 reenable php_html_puts 2002-05-12 14:48:22 +00:00
Rasmus Lerdorf
63e6666216 MTH - thought the code was slightly different in HEAD because of the
streams stuff, but it is exactly the same bug.
@ Safe-mode fix related to the safe_mode_include_dir feature (Rasmus)
2002-05-11 19:58:40 +00:00
Zeev Suraski
b9fd10786b Use portable #define 2002-05-11 13:49:44 +00:00
Zeev Suraski
bf97148978 Centralize html_puts() logic - php_html_puts() remains as an API wrapper 2002-05-11 12:41:33 +00:00
Zeev Suraski
77f41212f6 Removing HTMLization of ' ' wasn't ok, it didn't deal with series of spaces
properly.  Turn series of spaces into  's.
2002-05-11 12:17:53 +00:00
Zeev Suraski
19b7861d70 0 byte file uploads are valid, avoid choking on them 2002-05-11 11:58:16 +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
Edin Kadribasic
ffce791942 Added MD5 support for crypt() on Windows. 2002-05-10 04:58:05 +00:00
foobar
c241dc5c8b ws fix 2002-05-09 22:46:45 +00:00
Preston L. Bannister
3c8c01b475 Compute directory for temporary files once and use same directory for all subsequent calls. 2002-05-09 22:03:19 +00:00
Preston L. Bannister
0c7cfcda4f 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 (sigh)).
2002-05-09 21:18:26 +00:00
Preston L. Bannister
6de4f3a459 Add check for php.ini in same directory as php.exe (or equivalent executable that loaded php4ts.dll). Check is done before looking in the Windows directory. This allows distinct php.ini files when different applications using PHP are installed on the same system. Should be backwards compatible.
Note that checking for in CWD php.ini may be a security risk(?), and can now be made compile-time configurable by removing a single #define.

(This time with tabs for leading indent).
2002-05-09 20:34:53 +00:00
foobar
42c82bb40d Revert the last patches. 2002-05-09 20:03:36 +00:00
foobar
773da954f8 ws fix 2002-05-09 19:58:39 +00:00
Preston L. Bannister
fb0c506592 Add check for php.ini in same directory as php.exe (or equivalent executable that loaded php4ts.dll). Check is done before looks in the Windows directory.
This allows distinct php.ini files when different applications using PHP are installed on the same system.  Should be backwards compatible.

Note that checking for php.ini in CWD may be a security risk(?), and can now be made compile-time configurable by removing a single #define.
2002-05-09 19:51:18 +00:00
Preston L. Bannister
2d22fc3316 Compute directory for temporary files once and use same directory for all subsequent calls. 2002-05-09 19:36:03 +00:00
Rui Hirokawa
f30b722f14 Added conversion support from script character encoding to internal character encoding. This feature is very useful for japanese who uses Shift_JIS encoding because some of characters in Shift_JIS are including '0x5c' and it causes some troubles on Zend parser. This patch is made by Masaki Fujimoto. 2002-05-08 12:33:44 +00:00
Yasuo Ohgaki
2b5beee5ad Added estrdup() needed.
Fixed typo.
2002-05-08 11:44:14 +00:00
Sascha Schumann
50f68406cb Due to the thread-safety changes and lots of other stuff, the
current tree is not backwards compatible anymore.  Bump API no.
2002-05-07 22:00:33 +00:00
Frank M. Kromann
7c80fc1d9e Fixing win32 build. 2002-05-07 17:51:03 +00:00
Sascha Schumann
66036eab10 use thread-safe functions unconditionally 2002-05-07 13:24:07 +00:00
Sascha Schumann
946fca9c91 Add thread-safety to some conversion functions and sync a bit with
APR.
2002-05-07 05:26:30 +00:00
Zeev Suraski
fe127f93de We shouldn't force Content-length:, but much worse, it's wrong in many
cases (basically, unless you use output buffering to buffer all of your content,
it won't work;  output buffering is used for lots of different things as a
functional interface, and such buffers have no relation to Content-type at
all).
2002-05-04 23:23:16 +00:00
Sascha Schumann
707b8b019e Free string before overwriting it 2002-05-04 19:06:46 +00:00
Sascha Schumann
9743860d35 simplify handling of variables by maintaining two strings which
are simply appended instead of traversing the hash table on each
URL/form.

also fix an unconditional segfault in rshutdown due to efree'ing
a static char *.

remove remove_var, add reset_vars.  move the function declarations
into the right header file.
2002-05-04 18:33:13 +00:00
Sascha Schumann
4fe391cb91 these are case sensitive 2002-05-04 17:42:58 +00:00
James Cox
fb3d9b72e9 touch. 2002-05-04 17:41:03 +00:00
James Cox
7e22424996 add $id:$ line 2002-05-04 17:39:05 +00:00
Sascha Schumann
c998176089 free_index is set but never used 2002-05-04 17:34:41 +00:00
Sascha Schumann
7e05237ed4 call_result is set but never used 2002-05-04 17:32:01 +00:00
Yasuo Ohgaki
ae828233fe Forgot to dup strings. 2002-05-04 10:55:08 +00:00
Yasuo Ohgaki
b1b5e42251 Fixed reference to freed zval string value. 2002-05-04 09:46:44 +00:00
Yasuo Ohgaki
dfc48de0cb Fixed crash when buffer is over written in ob callback. (Bug $ 12227)
Added check current output function check for Centent-Length header.
@ Fixed output buffer crash when buffer is over written in callback. (Yasuo)
2002-05-04 03:02:51 +00:00
Thies C. Arntzen
9712a4b3c8 @ - Added output_add_rewrite_var() and output_remove_rewrite_var() to inject
@   and remove variables from the URL-Rewriter. (thies)
i have also modified the session module to use this - so it doesn't
need to fiddle with the output-system any more
2002-05-03 08:00:41 +00:00
Yasuo Ohgaki
5b83e9294c Change nest level to send Content-Length again. It seems this is the
best setting for now.

PHP will not send Content-Length always. It only sends when it is
possible to send. output_buffer=0 is supposed to disable chunked
output, but it seems it does not disable. It also behaves a litte
strange way. This should be addressed someday.

It is possible Content-Length header is not set. If it happens, try to
increase chunk size for now. (i.e. output_buffer=40960)

I included a little debug code for me and other develpers to play with,
when (NestLevel==1 && ObStatus==5), PHP sends Content-Length.
2002-05-02 13:55:05 +00:00
Sebastian Bergmann
738b47c13e The Windows build can now be configures more comfortably, for instance in regard to built-in extensions. 2002-05-02 09:49:41 +00:00
Yasuo Ohgaki
1103311eee Fixed header output. Only need to output header when it is actually sent to client. 2002-05-02 06:50:18 +00:00
Yasuo Ohgaki
8ee815ec91 Check buffer status 2002-05-02 04:04:59 +00:00
Yasuo Ohgaki
f61b795a8f Make Content-Type output always correct.
# Flushing buffer is needed to be fixed properly anyway...
2002-05-02 01:58:12 +00:00
Yasuo Ohgaki
43df0c78c0 Move Content-Length: header handling from zlib.c to output.c
When output buffer is enabled and header can be sent, Content-Length:
header is added always from now on.
2002-05-02 01:12:01 +00:00
Sebastian Bergmann
71872d8ec3 Add missing #define's. 2002-04-30 14:36:02 +00:00
Wez Furlong
b0ed189159 Remove debug code that should not have been committed.
# I must apologize for the quality of my commits tonight...
2002-04-30 00:22:44 +00:00
Wez Furlong
0989e7bb41 Remove this; it should not have been commited 2002-04-30 00:20:34 +00:00
Wez Furlong
479aa767f5 revert... 2002-04-30 00:17:48 +00:00
Wez Furlong
37411dd674 Implement context option setting API.
Add/amend debugging code for sockets.
Add a flag that will help the http wrapper optimize itself when
it is not being used for include/require.
2002-04-30 00:16:00 +00:00
Sebastian Bergmann
cd43b26095 Enable bundled build of ext/ctype and ext/mbstring on Win32. 2002-04-28 17:50:09 +00:00
Harald Radi
7e1a13131a already defined in zend_config.win32.h 2002-04-25 09:01:35 +00:00
Stanislav Malyshev
68e5f549c0 Init output_start_* to avoid "output started at ZZZZZ" messages
(which may result when output started while zend is neither compiling nor
executing - e.g., when file upload fails).
2002-04-24 16:53:07 +00:00