Commit Graph

2520 Commits

Author SHA1 Message Date
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
Derick Rethans
828c2a9c46 - argh... this is getting annoying 2002-09-06 07:47:49 +00:00
Anantha Kesari H Y
338332c799 NetWare related changes/modifications 2002-09-06 07:44:30 +00:00
Derick Rethans
dc3ea09991 - Please do not use spaces for indentation!
- Removed redundend ifdefs
2002-09-06 07:30:51 +00:00
Anantha Kesari H Y
dc5d3f5585 NetWare related additions/modifications 2002-09-06 07:27:27 +00:00
Anantha Kesari H Y
0ea12a47ab NetWare related additions/modifications 2002-09-06 06:39:57 +00:00
Dan Kalowsky
e560822fa7 silence a windows build warning 2002-09-05 21:29:39 +00:00
foobar
71ecad8fbe Remove unnecessarily commented code. 2002-09-05 21:16:34 +00:00
foobar
d94758bec2 Remove unnecessary commented code. 2002-09-05 21:12:55 +00:00
Derick Rethans
2b6ba50601 - Unbreak build 2002-09-05 18:11:33 +00:00
Derick Rethans
99850fcc28 - Tabs for indentation 2002-09-05 14:36:33 +00:00
Derick Rethans
5c0b6f7fa8 - Please use tabs for indentation 2002-09-05 14:32:47 +00:00
Anantha Kesari H Y
8b8f1e0590 NetWare related additions/modifications 2002-09-05 14:25:07 +00:00
Ilia Alshanetsky
eb58557e1c Fixed a buffer overflow that occurs when wordwrap is unable to calculate
the correct number of times the multi-byte break needs to be inserted into
the string.
2002-09-05 14:00:28 +00:00
Anantha Kesari H Y
96a4626b68 NetWare related additions/modifications 2002-09-05 12:09:57 +00:00
Anantha Kesari H Y
3e867bfdb1 NetWare related additions/modifications 2002-09-05 12:03:43 +00:00
Derick Rethans
60dcc761ac - php_error -> php_error_docref
- corrected proto of implode() (to match the docs)
2002-09-05 11:29:31 +00:00
Hartmut Holzgraefe
101d155baa in stristr:
this check was in the wrong place, the real version was some lines
below, this one assumed the type was 'string' in any case
now it looks like strstr
2002-09-05 11:12:01 +00:00
foobar
639221694f Use zend_ini_string instead of the 'alias'. 2002-09-03 22:54:02 +00:00
Jan Lehnardt
2334abeff4 - cosmetics 2002-08-31 21:43:54 +00:00
Jan Lehnardt
81dcd62bc2 - seperate registered streams.
#read: make sebastian happy ;)
2002-08-29 18:28:11 +00:00
Ilia Alshanetsky
7a7497e21b Fixed the \0 check in previous patch. 2002-08-29 15:58:33 +00:00
Ilia Alshanetsky
337448322f Fixed bug #18966 2002-08-29 15:44:00 +00:00
Jan Lehnardt
e1cac684df - fix ZTS build. thanks to edin. 2002-08-29 09:11:22 +00:00
Ilia Alshanetsky
f387972a97 Fixed compile warning (unused variable)
Added a \n separator between Addition Modules
2002-08-28 23:19:59 +00:00
Jan Lehnardt
6676617693 - add phpinfo() support for CLI.
@phpinfo() support for CLI (jan)
2002-08-28 22:31:51 +00:00
Rasmus Lerdorf
89651dabde Description didn't match the function here 2002-08-28 22:14:42 +00:00
Dan Kalowsky
936df3c34f silence build warning, added default case 2002-08-28 06:13:49 +00:00
Marcus Boerger
6063c8c478 fix fwrite to no longer apply stripslashes on input string when
magic_quotes_runtime is set On.
2002-08-26 23:18:59 +00:00
Marcus Boerger
f0b492b88d fix proto and tweak error message 2002-08-26 23:16:51 +00:00
Derick Rethans
fc7eb838fc - Whitespace 2002-08-26 09:47:46 +00:00
Derick Rethans
7edb660af9 @- Use escape_shell_cmd() to allow multiple extra parameters to the
@  invocation of the mailer as used in the fifth parameter to mail(). (Derick)
- Use escape_shell_cmd() to allow multiple extra parameters to the invocation
  of the mailer as used in the fifth parameter to mail().
2002-08-26 09:44:31 +00:00
Wez Furlong
ddddf398af WS 2002-08-25 19:44:25 +00:00
Ilia Alshanetsky
64ef43ecd4 Slight optimization of php_strtoupper & php_strtoupper functions. 2002-08-25 19:08:07 +00:00
Marcus Boerger
ba40963985 improoved error messages 2002-08-25 18:21:40 +00:00
Wez Furlong
5c6ad38c31 Prevent possible problems with include_path. 2002-08-25 12:09:57 +00:00
Wez Furlong
c7be7b55d1 Add a "closing" parameter for filters to determine if a flush is the last
flush before the stream is closed.  This allows filters to finish a chunk
and write footers etc.
2002-08-25 10:26:58 +00:00
Stefan Esser
3efb925931 Overwrite control chars in parameters with whitespace instead of truncating. 2002-08-24 11:37:50 +00:00
Marcus Boerger
149ad05b4f php_error_docref
#New conversion available at: http://docref.txt.marcus-boerger.de
2002-08-24 01:19:28 +00:00
Zeev Suraski
5a5e206ec2 Fix import_request_variables() 2002-08-24 00:45:09 +00:00
foobar
ff5ed789bc style fix 2002-08-22 01:20:50 +00:00
Ilia Alshanetsky
ea1bb5e172 Added monetary.h to prevent compile warning.
Fixed a memory leak inside money_format function, which occures if the
parameters to the function are not valid.
Fixed a segmentation fault inside money_format in the event the value
to be formated is >1024 bytes.
Made the return value of money_format be null terminated.
2002-08-21 13:14:57 +00:00
Marcus Boerger
95e933fc99 Fixes array test 004.phpt. Nice copy paste error. 2002-08-21 11:23:44 +00:00
Marcus Boerger
a70640480a Patch from Melvyn Sopacua <msopacua@idg.nl> finally fixes it (bug 19006). 2002-08-21 10:42:55 +00:00
Sebastian Bergmann
090e30a863 Fix ZTS build. 2002-08-21 06:22:19 +00:00
Marcus Boerger
d3d12daec4 add ini setting precision - this does not fix the real problem here 2002-08-21 03:13:33 +00:00
Marcus Boerger
be1e23cbc9 Add var_dump float format test 2002-08-21 01:27:56 +00:00
Marcus Boerger
534a63b5af Add combined base64 and md5 test 2002-08-21 01:26:21 +00:00
Marcus Boerger
9607a482b2 fix array tests
someone must have changed precision in php.ini-dist from 14 to 12
2002-08-21 01:22:02 +00:00
Wez Furlong
9d348ea800 Implement filter API for streams.
Filters can be stacked onto a stream; more details will follow in docs and
on php-dev.

Implement "string.rot13" filter

Allows the following script:

$fp = fopen("file.txt", "r");
stream_filter_prepend($fp, "string.rot13");

// File contents will be subject to a rot13 transformation before
// being output.
fpassthru($fp);
fclose($fp);
2002-08-20 20:47:47 +00:00
Wez Furlong
a9ba30cd89 fix vim modeline 2002-08-20 20:43:45 +00:00
Marcus Boerger
0f8681fc69 Changed handling of output buffer sizes. 2002-08-20 20:07:00 +00:00
Marcus Boerger
7bd7e14e4c Changed handling of output buffer sizes.
#.c to follow
2002-08-20 20:01:14 +00:00
Derick Rethans
c20c3fc610 - Fix for the compiler on Compaq Tru64 4.0F PK3 (bug #18974) 2002-08-20 11:18:18 +00:00
Wez Furlong
5f9a5a7c8e Remove php_stream_sock_set_blocking and replace with
php_stream_set_option which can be used in a similar way as ioctl()
to set options for streams.

Current options include buffering and blocking support.

o Buffer control is support for stdio based streams.
o Blocking/non-blocking is supported for stdio and socket based streams.
2002-08-19 22:59:10 +00:00
Ilia Alshanetsky
6dbc0e5483 Convert the value of tz_minuteswest inside struct timezone on Windows to
minutes from seconds.
2002-08-19 21:59:46 +00:00
Zeev Suraski
df4fdeb54e Fix a warning 2002-08-19 20:47:42 +00:00
Sander Roobol
bed405cce4 Sync with var_unserializer.re 2002-08-19 20:02:59 +00:00
Sander Roobol
47ae4068bb Made unserialize handle floats with an E notation - bug #18654
Patch by Christophe Sollet <csollet@coleebris.com>.
(I'll commit a new var_unserializer.c in a second)
2002-08-19 19:45:46 +00:00
Stanislav Malyshev
2282ac6074 ZE2 compatibility fix
## In ZE2 the hash contains zend_class_entry *!
2002-08-19 10:58:18 +00:00
Stanislav Malyshev
05156fa349 ZE2 compatibility fix
## In ZE2 the hash contains zend_class_entry *!
2002-08-18 12:22:28 +00:00
Ilia Alshanetsky
1aea030cf2 Corrected if() syntax in previous patch. 2002-08-18 07:54:33 +00:00
Ilia Alshanetsky
d42dbfce8e Fixed a segmentation fault that would occur if an entry contained a
non-terminated enclosure. Bug #12556
2002-08-18 06:55:32 +00:00
Ilia Alshanetsky
3bd899ea43 Fixed a compile failure in Win32 caused by previous patch.
Changed else statement to comply with PHP coding standards.
2002-08-16 15:04:00 +00:00
Ilia Alshanetsky
f11c3a4095 Added a handler for php -r '' for SAFE_MODE 2002-08-16 12:47:56 +00:00
Sterling Hughes
88c1d8983f clean this up a bit 2002-08-16 10:08:32 +00:00
Ilia Alshanetsky
b284497eaf Added safe_mode & open_basedir check when a user is chaning ini options
that specify file system paths. Fixes bug #17168.
2002-08-16 01:39:10 +00:00
Dan Kalowsky
dee21adc3d Fix for bug #18401, makes shuffle() properly generate all possibilities.
Patch provided by Adam Trachtenberg <adam@trachtenberg.com>
2002-08-15 19:09:05 +00:00
Marcus Boerger
18ef76e361 do not include "php_have_iconv.h" 2002-08-14 23:48:52 +00:00
Dan Kalowsky
19e42a2ed3 Fixed another memory leak, patch provided by Ilia <ilia@prohost.org> 2002-08-13 23:12:54 +00:00
Dan Kalowsky
ed135034a9 Fixes a memory leak which results when an invalid format code is
specified.  Patch by Ilia <ilia@prohost.org>
#Someone give him php4 karma :)
2002-08-13 21:56:39 +00:00
Rasmus Lerdorf
b025bb1023 Missing proto 2002-08-13 05:08:47 +00:00
Rasmus Lerdorf
f50df31d7f bool not boolean 2002-08-13 04:44:45 +00:00
Rasmus Lerdorf
d820c177bf dir() returns an instantiated object, not a class. 2002-08-13 04:24:15 +00:00
Wez Furlong
fc1ef270ce Implement curl based wrappers.
Currently read-only, and http is the only thing tested.
Because of this, using them can be controlled by configure:

--with-curlwrappers     Use CURL for url streams

Not for production use...

This enables http, https, ftp and ldap protocols as streams.
2002-08-12 15:56:13 +00:00
Wez Furlong
3fe62cf0fb Missing word... 2002-08-11 18:51:40 +00:00
Wez Furlong
bcef712ad6 Properly implement TSRM parameters to the new log_error
function... (Thanks Marcus!)
Add a convenience macro for importing a stream from a zval.
2002-08-11 14:29:01 +00:00
Wez Furlong
5a21ab42cb Introduce an error stack for wrappers, to help prevent multiple errors
and warnings (some of which are bogus) when there are problems opening
streams.
Implement sanity check on the mode used to open ftp and http connections.
This fixes Bug 12004.
2002-08-11 10:53:10 +00:00
Marcus Boerger
21903dfc7e corrected handling of internal output buffers
minor fixs
2002-08-10 16:12:36 +00:00
Marcus Boerger
9c8ba935d6 Improved handling of output buffers (see news)\n#No trim for the string parameter... 2002-08-09 22:29:58 +00:00