Commit Graph

2599 Commits

Author SHA1 Message Date
Wez Furlong
ae36c08b54 Fix Win32 build as PHP_CONFIG_FILE_SCAN_DIR is not #defined. 2002-10-05 10:55:54 +00:00
Wez Furlong
077fe52d8b This seems to resolve the issues with fgets.
I've moved EOF detection into the streams layer; a stream reader
implementation should set stream->eof when it detects EOF.
Fixed test for user streams - it still fails but that is due to an output
buffering bug.
2002-10-05 10:35:13 +00:00
Stefan Esser
87c0577a0c some broken ftp servers return 32bit port numbers. 2002-10-04 21:58:39 +00:00
Sterling Hughes
df837e67c7 have implode use the smart_str_*() functions, this should speed things up
quite a bit...
2002-10-04 20:44:19 +00:00
Rasmus Lerdorf
5610e348ec Kill a few more warnings 2002-10-04 18:03:29 +00:00
Marcus Boerger
3d6ecdeff0 return FALSE on error 2002-10-04 17:17:01 +00:00
Sander Roobol
e6e2c1c70d Fixed a bug in the new implementation of str_repeat() 2002-10-04 17:10:51 +00:00
Derick Rethans
ec6713f1ca - dot :) 2002-10-04 16:55:46 +00:00
Sterling Hughes
5605dcf7b6 fix a memory leak in implode()
# kept seperate from last commit on purpose.. ;)
2002-10-04 16:54:56 +00:00
Sterling Hughes
abc9991925 @ Make the glue argument to implode() optional, if it is not specified
@ default to using "". (Sterling)
2002-10-04 16:53:14 +00:00
Rasmus Lerdorf
989a61ed98 As discussed, add --with-config-file-scan-dir compile-time switch defining
a directory which will be scanned for *.ini files after the main php.ini
file has been parsed.  This makes it much easier to automatically deploy
a modular PHP since adding extensions which have their own ini switches can
now be done by simply dropping a foo.ini file in the right directory and
restarting.  A list of parsed ini files is maintained and shown on the
phpinfo page.
2002-10-04 04:47:35 +00:00
Sean Bright
114dff39ce Add missing ?> 2002-10-04 02:34:15 +00:00
Sascha Schumann
df0ea33d2b peek at freebsd's libc and fix _php_math_basetozval
PR: #19733
2002-10-04 02:21:33 +00:00
Sascha Schumann
cfaffd2185 overflow check for _php_math_basetozval 2002-10-04 02:20:41 +00:00
Sascha Schumann
397277b8c3 Fix php_stat brokenness. 2002-10-04 01:05:03 +00:00
Andrey Hristov
52c529c5af ws fixes.
#again :)
2002-10-03 18:15:18 +00:00
Ilia Alshanetsky
2ea2b662a4 Optimized str_repeat() function, it is now 10x faster on 1 byte multipliers
and 5-6x faster on multi-byte multipliers.
2002-10-03 13:59:31 +00:00
Yasuo Ohgaki
39b0eb9b22 Fixed broken code by Derick.
ob_implicit_flush() and ob_flush_all() are stopped working.
var_dump() and hightlisht_string() outputs buffer contents wrongly
with ob_implicit_flush().

Everyone should be happy now.
It was only OG(implicit_flush) interpretation issue after all.
2002-10-03 13:32:01 +00:00
Andrey Hristov
ae70a4e458 few ws fixes. 2002-10-03 12:06:52 +00:00
Andrey Hristov
cebb0f76b8 ws fixes. 2002-10-03 10:42: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
b0fcd61207 Fixed broken higlight_string() 2002-10-03 09:19:31 +00:00
Yasuo Ohgaki
1731767272 Prevent unwanted fluhsing. 2002-10-03 08:54:45 +00:00
Yasuo Ohgaki
66a50c5373 Added ob_flush_all() that flushes bufferred contents until it actually
sent/printed.
@ Added ob_flush_all() that flushes all buffers. (Yasuo)
2002-10-03 07:17:14 +00:00
Yasuo Ohgaki
f6dfd6b184 Forgot 1 byte for \0 2002-10-03 04:56:54 +00:00
Yasuo Ohgaki
5f1bb18c36 Save memory 2002-10-03 04:54:01 +00:00
Yasuo Ohgaki
bd177ce7c1 Added ob_get_clean() and ob_get_flush().
Someone requested this feature before.
@ Added ob_get_clean() and og_get_flush(). (Yasuo)
2002-10-03 01:36:44 +00:00
David Reid
9b10843481 Add more BeOS support... 2002-10-02 23:52:08 +00:00
Andrey Hristov
83a0f20381 Making strrchr() binary safe.
Test case added.
2002-10-02 18:58:09 +00:00
Andrey Hristov
2092d80230 Making strstr() binary safe. 2002-10-02 18:41:55 +00:00
Andrey Hristov
b2d93b67fc Ws fix. Forgot to add this in the previous commit. 2002-10-02 18:13:56 +00:00
Andrey Hristov
f02b1507dc ws fixes. 2002-10-02 17:56:04 +00:00
Colin Viebrock
f871f3870d Fix for SRM module (and maybe others). Header rows are now not HTML
escaped, so make sure you do this yourself in the modules.
2002-10-02 14:27:32 +00:00
Stefan Esser
a87f4afc35 repairing the chaos
utime("filename", NULL) is not only valid but a MUST on linux if you are
not the owner...
2002-10-01 21:53:25 +00:00
foobar
8634346e73 - Removed unnecessary dlopen checks. (this is done in Zend.m4 already) 2002-10-01 01:47:09 +00:00
David Reid
6477b0b5d8 Use the built in autoconf test for fnmatch. Simply using the
AC_CHECK_FUNCS seems to give false positives on beos and reading
the comments on other systems as well.
2002-09-30 23:31:13 +00:00
Sascha Schumann
21300f5e5a sync 2002-09-30 04:59:01 +00:00
Sascha Schumann
aa9bb5aefa Fix my stupid mistake which broke <form> handling 2002-09-30 04:56:38 +00:00
Jon Parise
033224784b @ - Added getopt() for parsing command line options and arguments. (Jon) 2002-09-30 03:02:52 +00:00
Ilia Alshanetsky
0454bf2d0d Removed the ceil(-0.5); test. The return value is depedant on system's
libc and even when proper value '-0' is returned, var_dump() converts
it to 0 anyway.
2002-09-29 21:45:54 +00:00
Ilia Alshanetsky
0e7e7ae961 Corrected ceil(-0.5) output value, it is 0 not -0. 2002-09-29 19:21:10 +00:00
Wez Furlong
7694770304 Rename streams functions to fit with naming conventions, adding aliases
for old functions where required.
Make use of recent changes to chunk size and timeout setting code.
2002-09-28 22:14:21 +00:00
Wez Furlong
8aae36aecb Add missing folding marker. 2002-09-28 13:04:47 +00:00
Yasuo Ohgaki
ec340e039a It must be GLOB_NOCHECK instead of GLOB_NOMATCH.
GLOB_NOMATCH does not make sense at all.
2002-09-28 09:14:45 +00:00
Wez Furlong
315e0a599b Implement stream_select() which works just like socket_select, but only on
streams.
@ - Added stream_select() which works like socket_select but only works on
@   streams returned by fopen(), fsockopen() and pfsockopen(). (Wez)
2002-09-27 23:42:38 +00:00
Colin Viebrock
69e677cda7 fix formating by breaking on to separate lines 2002-09-27 16:05:47 +00:00
foobar
08d3ad407c ws 2002-09-27 13:15:56 +00:00
Hartmut Holzgraefe
5797668cc3 /tmp/cvsmLUuXQ 2002-09-27 12:40:31 +00:00
Edin Kadribasic
bf094736b7 Update credits.
# Updated by scripts/credits. For some reason it put "Java" and "Win32 COM"
# twice. I removed the duplicates manually.
2002-09-27 12:23:49 +00:00
Yasuo Ohgaki
7dae78b7f5 No need to define GLOB_NOMATCH. 2002-09-27 11:44:42 +00:00
Jan Lehnardt
bcb3067d34 - be more conservative ;) 2002-09-27 10:17:52 +00:00
Sebastian Bergmann
cb6ef08e8c Fix ZTS build. 2002-09-26 19:48:56 +00:00
Colin Viebrock
982c510cd9 update credits page with proper HTML, fix HTML escaping, and a few tweaks 2002-09-26 19:33:23 +00:00
Sebastian Bergmann
fd7326395b Fix warning. 2002-09-26 19:18:35 +00:00
Sebastian Bergmann
b5d4b5496d Fix ZTS build. 2002-09-26 18:13:32 +00:00
Colin Viebrock
c7c275b741 fix phpinfo() output for better browser BC 2002-09-26 17:54:54 +00:00
Wez Furlong
4d9d06c874 Emit a warning when an unsupported charset is requested in htmlentities.
Fixed #18521.
2002-09-26 16:07:14 +00:00
Wez Furlong
c484eb8c97 Fix segfault in wrapper error log mechanism when errors are logged on
second and subsequent events.
Implement very simple recursion protection for user streams written
like this:
class urlEncodeStream {
    var $fp = NULL;

    function stream_open($path, $mode, $options, &$opened_path)
    {
        $this->fp = fopen($path, $mode); // <-- this recurses infinitely
        return is_resource($this->fp);
    }
}

file_register_wrapper('urlencode', 'urlEncodeStream');
$fp = fopen('urlencode:///tmp/outputfile.txt', 'w');

Noticed by: Yasuo.
2002-09-26 12:12:27 +00:00
Jan Lehnardt
1f227cd2e3 - GLOB_NOMATCH and GLOB_NOESCAPE are only defined in win32/glob.h
- fixes build on FreeBSD 4.6
2002-09-26 11:19:26 +00:00
Wez Furlong
4c2a9c091b Remove an unused variable and a now-unused function. 2002-09-26 10:17:41 +00:00
Wez Furlong
3a67c67737 Rename file_get_wrapper_data -> file_get_meta_data.
It now always returns useful information for all streams.
Unified that data with socket_get_status and made socket_get_status
an alias for file_get_meta_data.

Fix Location header following which was broken in this commit:
http://cvs.php.net/diff.php/php4/ext/standard/http_fopen_wrapper.c?r1=1.41&r2=1.42&ty=h
2002-09-26 10:14:41 +00:00
Yasuo Ohgaki
7d87babada Remove dup 2002-09-26 07:55:59 +00:00
Sebastian Bergmann
f5426838f9 Fix ZTS build. Fix warning. 2002-09-26 07:30:16 +00:00
Hartmut Holzgraefe
1a2df34d9d fix windows build 2002-09-26 07:15:33 +00:00
Hartmut Holzgraefe
0d815b5713 glob should now be ZTS/open_basedir/safe_mode aware (finally) 2002-09-26 00:27:52 +00:00
Hartmut Holzgraefe
419efa6eeb symbolic constants for fnmatch flags added 2002-09-26 00:27:13 +00:00
Andrey Hristov
7badd563cb Test case for strspn()/strcspn(). 2002-09-25 19:08:38 +00:00
Andrey Hristov
f80a817f7c Added common handler for strspn() and strcspn(). Almost of the code is
identical. Modified to accept up to 4 params. Last 2 optional start & len.
They are analogic to start & len of substr(). So the behavior when start &
len are used is like
strspn(substr($s,$start,$len),$good_chars) and
strcspn(substr($s,$start,$len), $bad_chars)
2002-09-25 19:06:29 +00:00
Andrey Hristov
fc46a46b06 str_shuffle() function added. Like shuffle() for arrays - however the
algorithm for creating the permutation is quite simple. More like
the implementation of shuffle() for 4.2.1 .
2002-09-25 18:06:05 +00:00
Andrei Zmievski
c9b9e63ea3 *** empty log message *** 2002-09-25 17:48:10 +00:00
Wez Furlong
0141e97052 Make these all work with persistent streams too. 2002-09-25 15:46:47 +00:00
Wez Furlong
696e0a2301 Implement persistent streams. (for pfsockopen).
Juggle some includes/definitions.
Tidy up streams use in ext/standard/file.c
2002-09-25 15:25:12 +00:00
Andrei Zmievski
27255d7419 Fix bug #17570. 2002-09-25 14:02:34 +00:00
Ilia Alshanetsky
322a24a526 prevent segv on Windows with negative localtime values. 2002-09-25 12:20:56 +00:00
Sascha Schumann
c57d419925 Sync 2002-09-25 12:15:42 +00:00
Sascha Schumann
41c0b43772 Allow - as part of an attribute
PR: #19573
2002-09-25 12:15:22 +00:00
Sascha Schumann
7af64ef531 Fix #13472 by making it possible to append the <input> stuff after
<fieldset> for xhtml compliance.
2002-09-25 11:06:24 +00:00
Sascha Schumann
91bbb302c1 Sync with .re 2002-09-25 10:36:19 +00:00
Sascha Schumann
3cadecec1b Allow malformed HTML such as
<a onClick=window.open("/hardware/somevar.php?hinfoid=","chgti") ..>

where ["'] are part of the attribute value.
2002-09-25 10:35:28 +00:00
Ilia Alshanetsky
f91b3d5c6d Fixed bug #17957 2002-09-24 16:34:54 +00:00
Zeev Suraski
5f1bffe0cd Fix indirection 2002-09-24 10:55:56 +00:00
Wez Furlong
a12423f959 Fix for #19570: last character in translation table is omitted. 2002-09-24 10:05:45 +00:00
Wez Furlong
4cdf8c7c36 Fix EOL markers for file() so that Mac EOL work correctly. 2002-09-24 02:46:38 +00:00
Wez Furlong
d14a7e0c19 WS 2002-09-23 18:13:31 +00:00
Wez Furlong
c74b9faca5 Implement a default_socket_timeout and auto_detect_line_endings ini options.
Also move user_agent from BG to FG.
2002-09-23 18:12:39 +00:00
Wez Furlong
35d29fb69e basic_functions.c 2002-09-23 17:27:37 +00:00
Sascha Schumann
7915f83342 (PHP touch) Remove an extraneous time() call.
Yasuo added this line in rev 1.90 for no apparent reason.
2002-09-23 14:59:24 +00:00
Sebastian Bergmann
fd329d2cd1 Fix warning. 2002-09-23 14:20:02 +00:00
Wez Furlong
9e84b3d5b5 Revise buffer/seek code a little.
Tidy up user streams even more.
Make test case quite aggressive.
2002-09-23 13:22:10 +00:00
Wez Furlong
4d8a07d529 Implement read buffering in streams.
Eliminate similar code from network.c.
Implement fgets equivalent at the streams level, which can detect
the mac, dos and unix line endings and handle them appropriately.
The default behaviour is unix (and dos) line endings.
An ini option to control this behaviour will follow.
# Don't forget to make clean!
# I've done some testing but would appreciate feedback from
# people with scripts/extensions that seek around a lot.
2002-09-23 01:47:04 +00:00
Derick Rethans
d52983dfab - Unbreak build 2002-09-22 16:23:44 +00:00
James Cox
b1b0230e6d typo 2002-09-22 16:14:11 +00:00
Derick Rethans
9c6f744649 - Fix ZTS build 2002-09-21 18:25:04 +00:00
Ilia Alshanetsky
fda169417f Added a test script for strip_tags() function. 2002-09-21 17:34:45 +00:00
Ilia Alshanetsky
8fc94a082f Fixed bug #7472 as well as many other bugs with strip_tags implementation. 2002-09-21 17:34:06 +00:00
Andrey Hristov
9ee1ce156f ws fixes.
#hope not to be flamed :)  what a wonderful day.
2002-09-21 16:10:33 +00:00
Ilia Alshanetsky
78f3ad40a8 Fixed bug #12934
locatime() now returns an error message when passed a negative value.
2002-09-21 15:41:20 +00:00
Sascha Schumann
30f038be18 Add '+' modifier.
+      A sign (+ or -) always be placed  before  a  number
              produced by a signed conversion.  By default a sign
              is used only for negative numbers. A + overrides  a
              space if both are used.
2002-09-21 15:08:59 +00:00
Andrey Hristov
9980cf5f53 Test case for array_intersect() and array_intersect_assoc() 2002-09-21 14:50:55 +00:00
Andrey Hristov
a920f00479 New function added - array_intersect_assoc() similar to array_intersect()
but the keys are also used in the comparison. So the result is a subset of
the result of array_intersect().
Test will be committed too.
2002-09-21 14:50:04 +00:00
Ilia Alshanetsky
bc8eda5385 Fixed bugs #12989 and #12120 2002-09-20 11:48:47 +00:00
Colin Viebrock
14a6cc8847 Change phpinfo() to use CSS styling instead of HTML code.
It doesn't render as nicely as it used to on older browsers, but it
does result in smaller files, and opens the door to using your own CSS
to style it differently.

There is a patch to Zend/zend_ini.c, but I don't have enough Karma, so
Derick has the patch.
2002-09-19 21:57:25 +00:00
Ilia Alshanetsky
a694fa9ca7 Fixed bug #19313
Fixed argument count check for system/exec/passthru functions
Added a check to system/exec/passthru functions to make sure execution
parameter is not blank before attempting to execute it.
2002-09-19 18:59:32 +00:00
Ilia Alshanetsky
9259c4e598 Fixed bug #19414 2002-09-19 18:22:51 +00:00
Zeev Suraski
aaf8d48fc3 Fix the last part of bug #13982 (ignore_user_abort() settings were 'leaking'
between requests)
2002-09-19 16:01:53 +00:00
James Cox
70f17979fb white background please 2002-09-18 21:56:00 +00:00
Ilia Alshanetsky
0dddad02fa Fixed bug #19446 2002-09-18 21:34:30 +00:00
Ilia Alshanetsky
869c42a511 Added additional handlers for compressed swf files, which require
entire file to be downloaded for successful decompression.
2002-09-18 20:37:24 +00:00
Wez Furlong
ff7bece5bb Tidy up some user stream code.
Add a small test case (not yet complete).
2002-09-18 10:15:40 +00:00
Hartmut Holzgraefe
f8358b44d1 setlocale() will now accept multiple locale arguments, first match wins 2002-09-18 07:55:30 +00:00
Hartmut Holzgraefe
4e6635742d it should not only work for the failure case
but also not fail (segfault) on the working case
2002-09-17 13:54:40 +00:00
Hartmut Holzgraefe
c5d4be214c stupid lino-typo .... :( 2002-09-17 12:59:36 +00:00
Hartmut Holzgraefe
0c7d9c3742 headers_sent() may now return information about where output started
using the optional $file and $line reference parameters
2002-09-17 12:37:26 +00:00
Jan Lehnardt
53b0623878 - fix typo in comment 2002-09-14 12:09:47 +00:00
Andi Gutmans
288e9b1793 - Don't think we need the do { } while (0) here 2002-09-14 06:38:48 +00:00
Ilia Alshanetsky
687312be41 Do not create the destination file, if opening of the source file failed
during copy().
2002-09-13 13:34:06 +00:00
Stefan Esser
714eb8069a made new ssl activate function the default. 2002-09-12 21:52:09 +00:00
Andrey Hristov
23d3cd79c1 Fixing my zts fix.
#Sorry Edin
2002-09-12 08:20:37 +00:00
Andrey Hristov
ad92434638 Removed magic numbers about the behavior of php_array_diff - proposed by
Andi and Jon Parise.
#It is strange that I commited ZTS code but after that Edin fixed ZTS build
#when I updated - it wasn't ZTS. hmmm. anyway fixing ZTS build.
2002-09-12 08:04:42 +00:00
Edin Kadribasic
ad34142e97 My compiler likes it like this. 2002-09-11 23:10:58 +00:00
Edin Kadribasic
705e72f363 Fix ZTS build. 2002-09-11 23:09:11 +00:00
Sterling Hughes
b34bec20a7 max this use the virtual_filepath() function and feel all threadsafe and
wholesome inside
2002-09-11 22:40:56 +00:00
Derick Rethans
aaf920f9d5 - Little whitespace changes 2002-09-11 18:40:56 +00:00
Andrey Hristov
2b710f7e5c Regression test for array_diff() and array_diff_assoc(). The latter is newly
introduced.
2002-09-11 18:16:11 +00:00
Andrey Hristov
afdfe38ef3 New function added : array_diff_assoc() . Like array_diff() but does
additional checks on key values. Test script will be added too.
#My first patch . it feels strange :)
2002-09-11 18:13:48 +00:00
foobar
746c147670 tok tok.. 2002-09-11 14:51:09 +00:00
foobar
daf6a5ab1a ws fix 2002-09-11 14:40:52 +00:00
foobar
be52343850 fix proto 2002-09-11 14:24:27 +00:00
foobar
a254506a3c ws fix 2002-09-11 14:21:39 +00:00
Edin Kadribasic
333b01b041 Fixed ZTS build. 2002-09-10 22:36:43 +00:00
Andrei Zmievski
dd7cf22443 @- Fixed array_merge_recursive() to avoid problems with merging cyclical
@  arrays (bug #16064). (Andrei)
2002-09-10 18:34:16 +00:00
Stefan Esser
184323cbe5 php_url_parse() replaces controlchars with '_' now. This stops fopen wrapper
CR/LF injection issues.
2002-09-10 08:06:25 +00:00
Andrei Zmievski
2c6154d7aa @- Added ability to extract() variables as references via OR'able EXTR_REFS
@  flag. (Andrei)
2002-09-09 20:05:20 +00:00
Wez Furlong
8a85e0f614 put that back... 2002-09-09 19:11:35 +00:00
Wez Furlong
6bc7e97161 Revert Dericks accidental commit :-)
Add an Id tag so we can see at a glance who is to blame.
2002-09-09 19:09:23 +00:00
Anantha Kesari H Y
97a601fc15 NetWare related changes/modifications 2002-09-09 10:12:44 +00:00
Stefan Esser
cbf5e3ca06 Added possibility to reuse an old SSL session id.
Ugly but needed for f.e.: debians ftpd-ssl
2002-09-08 22:26:11 +00:00
Shane Caraveo
2c6dca5a6e someone missed code requiring ssl 2002-09-08 20:52:03 +00:00
Stefan Esser
8dbcb26fd0 ftp(s) fopen() wrapper does no longer ignore the ip returned by PASV. 2002-09-08 19:35:42 +00:00
Stefan Esser
9fca868f90 Control connection gets closed in ssl mode now, too. 2002-09-08 19:11:07 +00:00
Stefan Esser
ec4a3fa68e Added EXPERIMENTAL ftps fopen wrapper.
For now this leaks the control connection stream because you cannot
close the control connection in ssl mode before you read the data.
2002-09-08 16:45:32 +00:00
Sander Roobol
8a9820331c Fix typo 2002-09-08 08:08:35 +00:00
Jan Lehnardt
de3b5c3631 - cosmetics 2002-09-07 23:14:22 +00:00
Ilia Alshanetsky
407088509f Added a check to ensure user_agent header is not sent if user_agent value
if blank.
2002-09-07 21:57:11 +00:00
Wez Furlong
3df412cf9b Fix a couple of bad pointer indirections (oops).
Lets stick to a single category of "http" for the "user_agent"
context override.
2002-09-07 20:58:30 +00:00
Wez Furlong
97f134cb45 fix warning 2002-09-07 20:54:14 +00:00
Wez Furlong
30082fdb68 Implement php://output wrapper, which can be used to write to the output
buffer via PHPWRITE.
2002-09-07 19:00:46 +00:00
Sterling Hughes
ce686a63de commit the correct/up-to-date version 2002-09-07 15:55:04 +00:00
Sterling Hughes
91df221ab7 @ Made the User-Agent that php's fopen wrappers send, configurable via
@ php.ini or via a stream context. (Sterling)

The stream context is untested, but it should/could work :)  Either way it
doesn't make the rest of the code bad. Wez -- please take a looksie for me
:)
2002-09-07 15:45:29 +00:00
Ilia Alshanetsky
3c95ac6b4f Fixed a massive memory leak that occurs when an opened webpage returns
a non 200 return code.
2002-09-07 07:13:43 +00:00