Compare commits

..
1918 Commits
Author SHA1 Message Date
SVN Migration 7bf2ac5146 This commit was manufactured by cvs2svn to create tag 'php_4_3_0dev'. 2002-06-16 10:58:56 +00:00
Sander Roobol fcb692a75d Made the tests (and not only run-tests.php) actually use php.ini-dist, and
removed unused php.ini file.
2002-06-16 10:58:54 +00:00
Markus Fischer c0736d6096 - List new session.use_only_cookies option. 2002-06-16 06:05:23 +00:00
Stig Bakken c55ce8b07f * set include_path when running "pear" 2002-06-16 05:43:48 +00:00
foobar d8a361b8d5 Fixed bug: #17732.
xmlrpc_decode_request() and xmlrpc_set_type() expect some parameters to be
passed by reference.
2002-06-16 02:24:18 +00:00
b9637a0bc5 ChangeLog update 2002-06-16 00:28:21 +00:00
Markus Fischer 1aac85becd - Be more verbose which index causes the warning. 2002-06-15 18:14:19 +00:00
Markus Fischer 9fea4c1f5f - Don't forget to close the stream. 2002-06-15 17:46:44 +00:00
Harald Radi a3c79eca49 workaround for a win32 memleak
# this definitely has to be revisited !
# maybe we should use winsock2 and overlapped IO
2002-06-15 16:04:59 +00:00
Harald Radi f7bdde218e workaround for a win32 memleak
# this definitely has to be revisited !
# maybe we should use winsock2 and overlapped IO
2002-06-15 15:58:16 +00:00
Sebastian Bergmann ebecbcb995 Add new target directories. 2002-06-15 09:40:19 +00:00
Andi Gutmans e8fe69884f - Fix copy&paste problem where we allocated according to an old structure
- decleration and not the new one.
2002-06-15 08:47:11 +00:00
bdc88cd7b6 NEWS update 2002-06-15 00:25:49 +00:00
e721a732c1 ChangeLog update 2002-06-15 00:23:18 +00:00
Markus Fischer 866329e61a - Update Win32/mail changes, mention bundled gd library. 2002-06-14 23:21:46 +00:00
Tomas V.V.Cox 9baec5623d - Fix issue with the DIRECTORY_SEPARATOR, did make the install of
XML_image2svg fail
- TODO++ and others minor stuff
2002-06-14 23:18:04 +00:00
Stig Bakken 972edb2795 * if verbosity config is > 3, display xmlrpc response
* another bugfix
2002-06-14 22:25:37 +00:00
Andrei Zmievski 6cac569055 Fix. 2002-06-14 20:16:50 +00:00
Sebastian Bergmann 01316104b3 Add gd_bundled to php_modules.dsw. 2002-06-14 16:37:24 +00:00
Alan Knowles 4f1531b163 remote list and remote listall, can now list non-stable packages if you set prefered_state to something else 2002-06-14 15:03:29 +00:00
Alan Knowles 78fffcce0e Fixed XML RPC sending of args - lets try and get the right tag :) 2002-06-14 14:55:28 +00:00
Edin Kadribasic 7e44ab0308 Use some more sane paths for win32 version. 2002-06-14 14:48:33 +00:00
Markus Fischer cf8166ee90 - Remove freetype.lib and HAVE_LIBTTF; we're always linking against freetype2
anyway.
2002-06-14 14:48:13 +00:00
Christian Stocker f9325a6a29 - renamed domxml_parser_reference to domxml_parser_entitiy_reference
- renamed domxml_cdata_block to domxml_parser_cdata_section
  (more consistent with the domxml_create_XXX methods)
- added domxml_parser_processing_instruction(target,data)
- added domxml_parser_namespace_decl(href,prefix)
2002-06-14 12:37:28 +00:00
Christian Stocker f185f06f27 - oops, that didn't even compile
- added domxml_parser_reference(reference)
2002-06-14 12:20:13 +00:00
Christian Stocker 7edd730be5 @ - Added preliminary SAX-Input support. It's now possible to build a DomDocument
@   with SAX-Events (added domxml_parser_start_document(), domxml_parser_end_document(),
@   domxml_parser_start_element(tagname[,attributes]), domxml_parser_end_element(tagname),
@   domxml_parser_characters(characters), domxml_parser_cdata_block(cdata),
@   domxml_parser_comment(comment), domxml_parser_get_document(). (chregu)
# More Sax Events to be implemented. Sax Output (from file or DOM-Tree) is
#  not that easy to implement, but possible...
2002-06-14 12:12:04 +00:00
Sebastian Bergmann 596859eb44 Remove unused local variables. 2002-06-14 05:42:08 +00:00
3ad50e1279 NEWS update 2002-06-14 00:29:45 +00:00
edb5b71501 ChangeLog update 2002-06-14 00:28:10 +00:00
foobar 748e75774d - Fixed bug #15803 (and propably others related too, part 2/2)
. Changed the configure/compile so that it doesn't "pollute" the INCLUDES
    anymore and thus cause trouble with other extensions which
    might use the same header files. (e.g. Informix)
  . Separated the #include statements to own file so we don't get any
    errors when compiling main/internal_functions.c
2002-06-14 00:07:16 +00:00
foobar 18943c345d - Fixed bug #15803 (and propably others related too)
. Changed the compile so that it doesn't "pollute" the INCLUDES
    anymore and thus cause trouble with other extensions which
    might use the same header files. (e.g. ODBC)
  . Some fixes for Informix compile problems (with the new build system)
  . Removed unnecessary stub.c file.
2002-06-14 00:01:49 +00:00
Markus Fischer fd3b919abf - Initial MSVC makefile to create a php_gd2.dll based on the bundled libgd,
works out of the box here with the right image libs and headers.
# Edin, I think it's your turn now. Feel free to tweak it for your needs.
# Could only compile Release_TS so far (no debug .lib files)
2002-06-13 23:08:40 +00:00
Markus Fischer d4711e51ae - We don't need the check here because the regex makes sure we never have \r\n
at the end of the header.
2002-06-13 22:25:28 +00:00
foobar f9e492d00b @- Fixed bug with Apache which let PHP_AUTH_* variables to be set when
@  external basic auth mechanism was used. (Jani)

Fixes bugs: #16653, #14534, #14370
2002-06-13 22:13:57 +00:00
Stefan Esser 6189dac445 Typo: == instead of = 2002-06-13 21:55:26 +00:00
Stefan Esser c3c4c6137a - should fix bug#17753 2002-06-13 21:42:39 +00:00
foobar ce379abfbd Fixed bug: #17751 (typo) 2002-06-13 19:41:25 +00:00
Stefan Esser 2eb859842b Fixed: possible bufferunderrun (worst case == invalid free bytes counter)
Fixed: isXXXX macros need (unsigned char) cast

Fixed: bug#17746 - control chars are now filtered within "to" and "subject" parameters
2002-06-13 18:54:45 +00:00
Tomas V.V.Cox cf4002fd58 Change a little the dep db structure
Comment the code and some clean up's
2002-06-13 15:10:42 +00:00
Tomas V.V.Cox 3507f15519 More work on the dependencies DB (still not tested/used) 2002-06-13 13:41:12 +00:00
Christian Stocker ff9a003f26 - Added DOMXML_LOAD_DONT_KEEP_BLANKS as possible mode, if one wants really nicely
formatted XML-Documents (but this can have sideeffects, if you depend on whitespaces..)
- bumped up domxml-api-version number.
2002-06-13 10:47:19 +00:00
Christian Stocker 1177e74fea @ - Added better error-messages (3rd parameter) and validating of DTDs (2nd parameter) to
@   domxml_open_mem(string xml[, int mode[, array errors]]) and domxml_open_file(string filename[, int mode[, array errors]]).
@ - Added domxml_doc_validate([array errors]) for validating existing DomDocuments with a DTD.
2002-06-13 09:05:56 +00:00
Edin Kadribasic 11bc56d48b Fix exit code (bug #17733). 2002-06-13 08:38:26 +00:00
Derick Rethans 1233f27eec - Fix for bug #14410 (Patch by C. McCohy <mccohy@kyberdigi.cz>). 2002-06-13 06:32:14 +00:00
foobar b5e46c5e05 Fix build in ZTS mode 2002-06-13 01:04:40 +00:00
be39b3fabc ChangeLog update 2002-06-13 00:25:40 +00:00
Jason Greene da18025d52 Fix entry 2002-06-12 23:26:37 +00:00
Stig Bakken efbb0b125c * comment typos 2002-06-12 21:23:22 +00:00
Stig Bakken 16a112094b * set working version to 0.91-dev 2002-06-12 21:19:51 +00:00
Stig Bakken ab9159719b * minor cleanup 2002-06-12 21:17:10 +00:00
Stig Bakken 3e7acb1ebf * this should have been done last year :) 2002-06-12 21:10:41 +00:00
Andrei Zmievski 4f4b983a39 This patch adds ability to capture string offsets in the preg_match_*()
results.
2002-06-12 20:04:20 +00:00
foobar 7a708cce74 typofix 2002-06-12 17:46:15 +00:00
foobar 01dff4d97a - Fixed bug #17669. PG(magic_quotes_runtime) wasn't reset for each request. 2002-06-12 17:25:48 +00:00
foobar 330a877d05 cleanup 2002-06-12 17:24:07 +00:00
Andrei Zmievski 62add42f05 set_error_handler() should take methods as callbacks. Also fixed it to report
invalid callbacks.
2002-06-12 17:02:19 +00:00
Andrei Zmievski 87f5f3962d Properly return the result of __call() handler. 2002-06-12 16:46:24 +00:00
Tomas V.V.Cox d2b830ff4a Attempt to make pear.bat work better under Windows 2002-06-12 16:31:53 +00:00
Hartmut Holzgraefe 808dd7dd5f fix for bug #10616 -> mktime() with negative date offsets not working on MacOSX 2002-06-12 15:35:27 +00:00
Christian Stocker 3ba753f3d8 Fixed domxml_get_element_by_id() 2002-06-12 11:13:11 +00:00
Sascha Schumann dcf67c4433 This option enables administrators to make their users invulnerable to
attacks which involve passing session ids in URLs.
2002-06-12 08:18:36 +00:00
e64b5c7045 NEWS update 2002-06-12 00:43:38 +00:00
b2c91950f6 ChangeLog update 2002-06-12 00:41:49 +00:00
Markus Fischer 9ec38259ed - Those have been implemented already. 2002-06-11 21:29:32 +00:00
Markus Fischer 17b3ef47f3 - Fix builtin gets() emulation (hopefully). 2002-06-11 21:22:12 +00:00
Markus Fischer 137a290086 - Add some recent observations with bz2. 2002-06-11 21:06:38 +00:00
Markus Fischer 4290da23d0 - Add missing Id tag. 2002-06-11 18:55:48 +00:00
Markus Fischer 709785a90a - Always \0 terminate data returned from _php_stream_copy_to_mem(). 2002-06-11 18:54:57 +00:00
Andi Gutmans b4a76acfa4 - Don't show debug_backtrace() in the trace itself.
- This patch is a bit ugly because the whole code itself is pretty complex
- and hard to re-order.
2002-06-11 18:37:41 +00:00
Andi Gutmans b2015c5610 - Fix problem with assigning functions by reference. 2002-06-11 17:33:53 +00:00
Jason Greene 1745076ffc Forgot one 2002-06-11 13:50:00 +00:00
Jason Greene abaefad8d3 Sockets currently works great with all compilers on Solaris
Update TODO
2002-06-11 13:48:49 +00:00
Hartmut Holzgraefe ddac6892f4 now it works on streams (plus some debug code removed) 2002-06-11 09:37:31 +00:00
Hartmut Holzgraefe c39a3bc880 macro definition fixed, guess it was the usual kind of cut&past bug? 2002-06-11 09:36:48 +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
Markus Fischer b7cab12d21 - These things have been done already. 2002-06-11 08:33:09 +00:00
Sebastian Bergmann 1d6686c936 Add __delegate(). 2002-06-11 08:06:02 +00:00
Jason Greene c6a36d585b @Impelemented timeout functionality, and fixed error handling of fsockopen() on win32
Also fixed error handling on unix (micropatch)

Closes Bug #14740
2002-06-11 03:55:28 +00:00
e51bd48d22 ChangeLog update 2002-06-11 00:36:16 +00:00
foobar 73f2ab9951 - Reverted last bogus commit and fixed the credits in NEWS.
# STIG! Do a 'cvs update' before you commit anything!!
2002-06-11 00:18:34 +00:00
Markus Fischer 9b1ec11184 - Typo. 2002-06-10 22:43:49 +00:00
Stig Bakken a4ecce0cd9 @Add --with-mysql-sock option (James Cox) 2002-06-10 21:35:26 +00:00
Markus Fischer cad4ddebed - Revert zlib.lib patch.
# Only add it after ext/mysql takes really advantag of it on win32, needs
# also modification in mysql/libmysql/config-win.h
2002-06-10 21:29:01 +00:00
Harald Radi fd8082ef67 pooling and singleton finally work 2002-06-10 21:16:25 +00:00
Harald Radi f1f6818c20 new testcases 2002-06-10 21:15:38 +00:00
Harald Radi ba364121f1 added TS_HASH macro 2002-06-10 21:14:48 +00:00
Frank M. Kromann 4b40b9513b Adding ini setting for max_procs 2002-06-10 20:00:20 +00:00
Frank M. Kromann 509c606dbc Adding ini setting for max_procs 2002-06-10 19:31:29 +00:00
Harald Radi fd0d39da8f mysql need zlib.lib now
#again, something seemed to be messed in my last commit
2002-06-10 18:47:16 +00:00
Sergey Kartashoff 662235a522 # Mnogosearch new function calls fixes 2002-06-10 16:46:06 +00:00
Jan Lehnardt a8de8ec90c - whitespace fix 2002-06-10 16:34:25 +00:00
Markus Fischer cac49284b4 - Fix win32/mysql.
- Revert cryptic WS commit on php4dllts.dsp.
2002-06-10 15:53:26 +00:00
Joseph Tate 5bb233a931 #Undeprecated attribute access methods 2002-06-10 14:48:28 +00:00
Harald Radi f9fa95067b mysql need zlib.lib now 2002-06-10 13:14:43 +00:00
Harald Radi d63056b10b fix the build
# these files were blank, i suppose this happened by accident
2002-06-10 13:09:46 +00:00
Sergey Kartashoff 05a304d3a9 - MnoGoSearch extension compile fix with mnogosearch-3.2.4 and 3.2.5 2002-06-10 12:24:43 +00:00
Markus Fischer 0996358943 - WS fix, damn win32. 2002-06-10 12:24:15 +00:00
Harald Radi 8e19555608 fix the build 2002-06-10 12:21:58 +00:00
Markus Fischer f9936a8459 - Fix proto. 2002-06-10 10:28:33 +00:00
Stanislav Malyshev 3a419fa8dd Fix leak 2002-06-10 09:15:02 +00:00
Sergey Kartashoff 2c6e3c80a1 # mnogosearch update. Does not compile at this moment, but
# there are not so many things left to fix...
2002-06-10 08:55:18 +00:00
Markus Fischer 3856c3ff39 - Fix easter_(days|date)()s first parameter now really defaults to the current
year if ommited (it was document but didn't work).
2002-06-10 07:51:28 +00:00
Andrei Zmievski 7f4c12b006 Fix bug #7045: shuffle() now provides consistent distribution of values
in the array.
2002-06-10 02:28:32 +00:00
0258d9e2ee ChangeLog update 2002-06-10 00:37:32 +00:00
Tomas V.V.Cox 4bb9c66fee Commented out old unused stuff
# I'm not familiar with the 'make' syntax, please tell me if
# something is wrong
2002-06-09 18:34:04 +00:00
Tomas V.V.Cox 613496c4ef Moved to pear/Archive_Tar/scripts 2002-06-09 18:25:40 +00:00
Tomas V.V.Cox c67c595645 if (!dl(php_gtk)) die("Unable to load the php_gtk extension\n"); 2002-06-09 18:18:01 +00:00
Tomas V.V.Cox 8c8599222e Beautify config-show output, some wrap changes and fix small
issue with _tableRow() with line counting
2002-06-09 18:12:59 +00:00
foobar 0e26e149bf cleanup 2002-06-09 17:05:17 +00:00
Tomas V.V.Cox 0d5d98a6d8 displayLine() -> outputData() 2002-06-09 16:29:50 +00:00
Tomas V.V.Cox 7647781340 - outputData($data, $command)
+ outputData($data, $command = '_default')
2002-06-09 16:28:46 +00:00
Harald Radi 30e1541595 reflect the new abstraction changes in the demo layer 2002-06-09 14:52:50 +00:00
Harald Radi c55e855fdd - using stas' abstraction now
- layer can add individual ini settings now
- classentries for the loaded rpc object are created dynamically now
  class hirarchy looks like: rpc<-[layer]<-[object]  (e.g. rpc<-com<-adodb),
  thus the whole class tree is reflected into php
- added user-functions to mark an object as a singleton and as poolable

#rest of the linuxtag work
2002-06-09 14:51:41 +00:00
Harald Radi ecad1fbc5a pg_escape_* functions were not available on win32 due to a missing define
#if this breaks the build because the win32 pg libs don't export the functions
#we should consider implementing them somehow else
#some linuxtag work
2002-06-09 14:32:40 +00:00
Harald Radi 3738a6edd0 only check for an available class entry instead of
the std_object_handlers on some places

#some linuxtag work
2002-06-09 14:20:37 +00:00
Sander Roobol 85a99fa5a3 Don't use headers if the module contains only one phpinfo() entry, just
stick to ordinary rows.
2002-06-09 12:56:27 +00:00
Sander Roobol c5dc21f8c2 Made phpinfo() show if we're using the bundled version of GD 2002-06-09 12:44:33 +00:00
James Cox 210744928f dont test for the socket -- enables installs over NFS etc.
# my previous commit was the revision before the fixed one (ie, i had the fix) so apologies for that.
2002-06-09 11:43:50 +00:00
Sander Roobol a2849b868b Fixed detection of JPEG support in bundled version of GD. 2002-06-09 11:27:04 +00:00
Sander Roobol 2f6c2a9b18 Fixed configure stuff
# It didn't work for me... hope it works for everybody now...
2002-06-09 10:46:13 +00:00
Andrei Zmievski 5f3a9ebf13 Make RAND_RANGE() an API macro. 2002-06-09 04:26:36 +00:00
foobar fd70290b76 De-messify 2002-06-09 00:53:28 +00:00
foobar c8bacb7a06 Cleaned up the mess. Now it actually works too.
# TEST BEFORE COMMIT!!
2002-06-09 00:50:46 +00:00
fb7e21effd NEWS update 2002-06-09 00:22:17 +00:00
f6c9059da5 ChangeLog update 2002-06-09 00:22:00 +00:00
Christian Dickmann 3dd47bc651 add modes to list-all. fix a mergerbug 2002-06-08 18:44:34 +00:00
Sascha Schumann 5e148e3875 too many flushes are bad 2002-06-08 18:11:03 +00:00
Tomas V.V.Cox 2ed7358250 Hopefully fixed a couple of problems with destination paths:
- Bug #17529
- In Windows getting <pear>\/\<file>
- Documentation under <doc_dir>/Package/Package/

# Please test it and report possible problem
2002-06-08 17:34:46 +00:00
Andrei Zmievski 8515f3ec54 *** empty log message *** 2002-06-08 13:46:36 +00:00
Andi Gutmans 90f43c78b0 - This should improve performance on Windows 2002-06-08 13:01:05 +00:00
Andi Gutmans 1186d51c3a - Add a loop unrolled version of the hash function and a bit of an
- explanation about our hash function (Ralf S. Engelschall)
2002-06-08 12:44:39 +00:00
James Cox 00779e5fa3 @ added support for --with-mysql-sock so people can specify it (eg, NFS compiles, etc)
changed the default mysql.sock location to use the one from the RPM. Added /usr/local
  locations to the search list. (imajes)
2002-06-08 11:37:20 +00:00
Markus Fischer 0cd40c2808 - Since streams are always enabled, instead of just printing 'enabled' we tell
what streams are currently registered.
2002-06-08 10:25:44 +00:00
75f925dd37 NEWS update 2002-06-08 00:25:03 +00:00
a7f8fc82c5 ChangeLog update 2002-06-08 00:22:08 +00:00
Tomas V.V.Cox f33c5896ac Experimental dependencies database handling functions
(not yet in production)
2002-06-07 18:07:38 +00:00
Sebastian Bergmann 874cdf43a6 Unbreak build by setting PHP_PREFIX to c:\php4 for now. 2002-06-07 15:30:13 +00:00
Sebastian Bergmann 49446bb216 Fugbix typo. 2002-06-07 15:24:03 +00:00
Zak Greant 9daec6d227 Updating embedded libmysql to version 3.23.48 2002-06-07 15:07:55 +00:00
Tomas V.V.Cox fcd6d2b5cd Beautify remote-info 2002-06-07 15:06:25 +00:00
Joseph Tate 7a58bc690a Added aliases to make attr_node access functions more consistent.
Old access functions are now deprecated.
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: 	php_domxml.c
CVS: ----------------------------------------------------------------------
2002-06-07 14:56:08 +00:00
Tomas V.V.Cox f3673c8798 - Reapplied the "treat umask as octal in "config-set"
command" Stig's patch
- Ported the config-help command to new UI API
2002-06-07 14:50:39 +00:00
Tomas V.V.Cox 8f21117efb more wrapping cases 2002-06-07 14:48:01 +00:00
Stig Bakken 41e31645dd * fix SHLIB_SUFFIX_NAME define for Windows 2002-06-07 12:20:28 +00:00
Stig Bakken 40ab700677 @New constants: PHP_PREFIX and PHP_SHLIB_SUFFIX (Stig) 2002-06-07 12:19:26 +00:00
Tomas V.V.Cox ebea2ed5cf Remove debug code 2002-06-07 10:22:00 +00:00
Tomas V.V.Cox eeb7f9dafc More info output retouchs 2002-06-07 10:20:41 +00:00
Tomas V.V.Cox b5bf0fb154 Fix some minor issues with the parsing 2002-06-07 10:18:59 +00:00
Stig Bakken 2bc921c60a * get rid of pearize 2002-06-07 10:17:25 +00:00
Tomas V.V.Cox c083784023 Make "info" full human friendly (in deps list and lastmodified) 2002-06-07 08:45:00 +00:00
Tomas V.V.Cox 9f46d24922 Make $_deps_rel_trans and $_deps_type_trans globally avaible:
moved from Command/Package.php -> Command/Common.php
2002-06-07 08:43:45 +00:00
Tomas V.V.Cox 149dcec76f Be nicer with the help 2002-06-07 08:05:48 +00:00
Tomas V.V.Cox 7770b625ba ws 2002-06-07 08:04:05 +00:00
Stefan Esser 5956656864 - Stay always in buffer 2002-06-07 08:00:12 +00:00
Tomas V.V.Cox 1dac8c275b Put back the "info" command in its full state:
"Displays information about a package. The package argument may be a
local package file, an URL to a package file, or the name of an
installed package."
Command "package-info" depreciated (again)
2002-06-07 07:54:28 +00:00
ea16e37e9b ChangeLog update 2002-06-07 00:31:30 +00:00
Sebastian Bergmann b0d61f9bd3 Add RFC on delegation. 2002-06-06 21:13:39 +00:00
Daniela Mariaschi 8a65d5d3cb Add control on IB version. ibase_add_user(), ibase_modify_user()
and ibase_delete_user() are available with IB6 or later
2002-06-06 19:51:04 +00:00
Daniela Mariaschi 70184d32a4 Add control on the IB version. ibase_add_user(),ibase_modify_user()
and ibase_delete_user()  are available with IB6 or later
2002-06-06 19:47:28 +00:00
Markus Fischer 3a3fe41817 - Update 2002-06-06 18:38:32 +00:00
Markus Fischer cc01a5dabf - Remove C++ comments. 2002-06-06 17:59:37 +00:00
Markus Fischer 565f3797dc - Revert Ws thingy.
# Lazy bastard :-)
2002-06-06 12:58:25 +00:00
foobar 49523ba7d1 Changed the configure option to be --enable/disable 2002-06-06 12:44:28 +00:00
Stig Bakken 678456cf0f * prepare 0.90 2002-06-06 11:31:07 +00:00
Stig Bakken d1826b4287 * add "nobuild" option to installer (-B or --nobuild option to CLI frontend) 2002-06-06 10:51:26 +00:00
Stig Bakken d8c07cc63d * remove debug output 2002-06-06 10:37:13 +00:00
Stig Bakken cf81f686e9 * when building, look for "package-version" subdirectory, needed for
building stuff straight from tarballs
2002-06-06 10:35:16 +00:00
Stig Bakken 9161f8a32e * add PEAR_COMMON_PACKAGE_NAME_PREG constant 2002-06-06 10:16:42 +00:00
Stig Bakken 3c587c0aad * make displayFatalError work again 2002-06-06 10:16:01 +00:00
Tomas V.V.Cox aa7d447d25 Forgot that one 2002-06-06 09:05:04 +00:00
Tomas V.V.Cox 8447d094c6 Wrap table contents
# Sorry could't wait for that commit :-)
2002-06-06 08:50:31 +00:00
Tomas V.V.Cox 41e7696ec9 Implemented "pear info <Installed Package>" command
# Stig, why I'm sure that you already have implemented this
# command? Have to stop with my LSD therapy
2002-06-06 07:25:07 +00:00
Tomas V.V.Cox ec9c0bf0a7 Split the doPackageInfo() in doPackageInfo() and _infoForDisplaying()
(this last one can be statically called and is used also from
the "info" command)
2002-06-06 07:22:23 +00:00
Tomas V.V.Cox eb54d687ad package.xml file for the PEAR Mail package 2002-06-06 06:43:19 +00:00
Tomas V.V.Cox fda17098b1 That will really avoid PHP warnings 2002-06-06 06:40:05 +00:00
Tomas V.V.Cox 1971e52e33 Fix package command
# can't beleive you don't test commits :-)
2002-06-06 06:35:12 +00:00
Sergey Kartashoff 8fe1b8e9d8 # More mnogosearch updates 2002-06-06 05:45:46 +00:00
82bc088c57 ChangeLog update 2002-06-06 00:22:05 +00:00
foobar 9f238de87b ws and indent fixes 2002-06-05 23:58:51 +00:00
foobar 12f6175f26 - Fixes a segfault reported in #17584 2002-06-05 23:24:23 +00:00
Sebastian Bergmann e449646b68 Remove unused local variable. 2002-06-05 18:17:19 +00:00
Andi Gutmans 2d6404d5b0 - Allow overloaded objects to receive the method name in its original
- case.
2002-06-05 17:34:56 +00:00
Markus Fischer 6c6ac37be4 - Headers are now rewritten to always have \r\n line endings for SMTP.
Also automatically removes superflous line breaks at
  the start and end of the header.
# http://cr.yp.to/docs/smtplf.html is a good read about this topic.
2002-06-05 17:08:38 +00:00
Derick Rethans 3fb8db4ca8 - Fix a problem in domxml_dump_mem(_file) with xmlKeepBlanksDefault not
being set. (patch by Rob Richards <rrichards@digarc.com>)
2002-06-05 15:24:49 +00:00
Sergey Kartashoff 3b1d852949 # mnogosearch work continued 2002-06-05 14:34:54 +00:00
Stefan Esser 23ceadfe2b fixed multiline header detection (':' is valid within following lines)
fixed fill_buffer to fill the buffer always completely
2002-06-05 13:35:34 +00:00
Sergey Kartashoff 30afc3585c more mnogosearch compilation fixes 2002-06-05 13:06:56 +00:00
Stefan Esser a06a3e1f7f fixing some crashbugs that can be triggered with bogus uploads. 2002-06-05 11:28:33 +00:00
Sergey Kartashoff 1e3b1d16c1 MnoGoSearch extension fixes to compile under latest
mnogosearch 3.2.4 and 3.2.5. Still does not compile with them,
but the work still in progress...
2002-06-05 10:11:04 +00:00
Derick Rethans 1db85d6651 - Fix memleak (patch by Stefan Sesser) 2002-06-05 09:56:28 +00:00
e9b12faedb NEWS update 2002-06-05 00:26:11 +00:00
9bfc10a0fa ChangeLog update 2002-06-05 00:24:06 +00:00
Derick Rethans 733ebde160 - Fix for bug #17462 (Patch by Edin Kadribasic) 2002-06-04 21:58:05 +00:00
Edin Kadribasic 9d04bf58e3 Sync with openbsd glob.c 1.19 2002-06-04 21:26:06 +00:00
Edin Kadribasic 9143760ecd Removed some leftover debugging code. 2002-06-04 21:15:35 +00:00
foobar 9a47e545f6 - Fixed the include paths for the needed libraries for bundled libgd.
- Removed files which are not needed with libgd2 from the PHP_NEW_EXTENSION.
2002-06-04 18:44:54 +00:00
Edin Kadribasic 3b3ec06ee7 Added function pcntl_alarm().
@- Added pctnl_alarm() function. (Edin)
2002-06-04 15:51:25 +00:00
Stig Bakken 4317a5c7a9 * sort package names in "pear list" 2002-06-04 15:25:23 +00:00
Joseph Tate 68845d9811 #Whitespace fix: Sorry 2002-06-04 14:30:12 +00:00
Joseph Tate 316f8f0764 Bug fix to #17560 submitted by Rob Richards 2002-06-04 14:20:54 +00:00
Mark L. Woodward 63ded04ef5 Added persistent connections, and automattic reconnect on
lost connections. Requires Phoenix 1.0
2002-06-04 13:59:46 +00:00
Markus Fischer b4bcdda57b - Fix ZTS built. 2002-06-04 08:54:14 +00:00
foobar 1528a3d1fb Fixed bug: #17535 2002-06-04 02:33:10 +00:00
foobar 2be8691887 fine tuning 2002-06-04 01:27:29 +00:00
foobar 1a06a2fa15 - Made the bundled libgd actually work. Fixed bug: #17244 2002-06-04 01:13:01 +00:00
529ad188e1 NEWS update 2002-06-04 00:24:58 +00:00
1fad1a1b96 ChangeLog update 2002-06-04 00:22:49 +00:00
Markus Fischer 8e8f75a864 - Move macro code into distinct function for easier debugging as suggested by
Andi.
2002-06-03 20:52:07 +00:00
Rasmus Lerdorf ca9c4270f8 Make sure len is defined here 2002-06-03 18:26:27 +00:00
Edin Kadribasic e7ab5766d6 Fixed array_rand() on ZTS platforms.
@- Fixed array_rand() on thread-safe platforms such as Windows. (Edin)
2002-06-03 17:49:48 +00:00
Markus Fischer 8060dae548 - Fix isatty() and ttyname() (Closes #17323, #17333). 2002-06-03 15:49:38 +00:00
Markus Fischer 44afb19d40 - Fix a leak and a crash. 2002-06-03 14:39:30 +00:00
Markus Fischer 504d7c2ebd - Add note about IIS/CGI and cgi.force_redirect gotcha 2002-06-03 11:11:41 +00:00
6277fb312e NEWS update 2002-06-03 00:26:00 +00:00
05c7e945e0 ChangeLog update 2002-06-03 00:24:11 +00:00
Stig Bakken b8ec647fc5 * fix bug that was re-introduced during merge 2002-06-02 23:59:41 +00:00
Markus Fischer 9a97d55647 - Only add the To: field with the $to parameter if we don't have it in the
custom header. This was the behaviour < 4.2.x (but it was broken, this one
  isn't).
# last commit for today, promised.
2002-06-02 23:39:59 +00:00
Markus Fischer d497ca147e - Revert fix for #14407. The From: header field IS different from the
sendmail_from field which is in fact the retturn path.
2002-06-02 22:54:48 +00:00
Markus Fischer 1ec78a1e18 - Try to fix most of the buffer overflows and dynamically allocate memory where
applicable.
2002-06-02 22:10:25 +00:00
Adam Dickmeiss 553eda4145 Use ZOOM API for newer YAZ versions. 2002-06-02 21:59:58 +00:00
Adam Dickmeiss 0315c1e1c9 report error when YAZ cannot be found 2002-06-02 21:58:35 +00:00
Stefan Roehrich cce0d2f72d Added "Vary: Accept-Encoding" header to zlib.output_compression
compressed output as with obgzhandler().
@ If zlib.output_compression is enabled and a page is compressed
@ a "Vary: Accept-Encoding" header is added. (Stefan)
# obgzhandler() sends this header, I think it is recommened by
# RFC 2616. If there are problems (e.g. with some browsers)
# it should be reverted.
2002-06-02 21:35:06 +00:00
Christian Dickmann ee44ad4f5b make 'pear remote-info' work with CLI 2002-06-02 20:24:50 +00:00
Christian Dickmann 19c946cce2 make 'pear search' work with CLI. fix a typo 2002-06-02 20:13:50 +00:00
Markus Fischer b04656ad40 - Finish implementation of custom smtp port (introduces "smtp_port" ini config). 2002-06-02 17:13:48 +00:00
Markus Fischer c43f813d8e - Rephrase comment 2002-06-02 16:25:06 +00:00
Markus Fischer 05293f09eb - Classig problem: right idea, wrong pointer ... 2002-06-02 15:29:07 +00:00
Christian Dickmann 0220472176 silence unlink() and rmdir(). fix a bug where wasn't set due to wrong ini setting 2002-06-02 14:27:15 +00:00
Stig Bakken f111dff665 * merge NEW_UI_API branch 2002-06-02 13:07:19 +00:00
b341789bb8 ChangeLog update 2002-06-02 00:26:59 +00:00
Stefan Roehrich 506282af5c WS change to make very old compilers/preprocessors (e.g. HP/UX 9)
happy (thanks to Andreas Ley for recognizing this).
2002-06-01 20:14:58 +00:00
Sascha Schumann 190b65f4a1 Fix build 2002-06-01 17:38:23 +00:00
Andi Gutmans f8a3bc3fdd - Fix build with Engine 2 2002-06-01 11:38:41 +00:00
Andi Gutmans 0d5862d75a - Reapply netware patch 2002-06-01 10:27:51 +00:00
Rasmus Lerdorf f01a42b499 Put Netware header and comment back in. My CVS revision id got messed
up somehow.
2002-06-01 09:54:28 +00:00
Sander Roobol a6abfcbbe7 Update cracklib path and comment it out (thanks to Urs Gehrig for the hint) 2002-06-01 09:53:07 +00:00
Frank M. Kromann 426b47837f Makring function declarations match implementations (ZTS compilation) 2002-06-01 05:45:25 +00:00
fbde334434 NEWS update 2002-06-01 00:36:08 +00:00
99b8d68583 ChangeLog update 2002-06-01 00:33:31 +00:00
Rasmus Lerdorf b66f48c3ce Oops 2002-05-31 23:52:07 +00:00
Rasmus Lerdorf 6b756ea46c @ Renamed getallheaders() to apache_request_headers() and kept
@ getallheaders() as an alias to it.  Also added apache_response_headers()
@ which returns the current response headers from Apache.
Renamed getallheaders() to apache_request_headers() and kept
getallheaders() as an alias to it.  Also added apache_response_headers()
which returns the current response headers from Apache.
2002-05-31 23:49:49 +00:00
foobar 73ab5708b4 Fixed typo.. 2002-05-31 23:20:04 +00:00
Tomas V.V.Cox 3a32f51b11 fread already detects EOF 2002-05-31 18:49:47 +00:00
Tomas V.V.Cox 5d43ef2cd0 Be able to handle strings as well as arrays in _multipleToStruct() 2002-05-31 18:12:56 +00:00
Tomas V.V.Cox 5cb633933f - Make mkTemp() automatically removed temporary created files
or dirs at script shutdown time
- Remove unnecesarry PEAR inheritance
- Some PHPDoc fixes
2002-05-31 17:47:19 +00:00
Andi Gutmans 00e25fd42a - Add zend_objects_API.* to dsp 2002-05-31 15:34:36 +00:00
Andi Gutmans 006c46e920 - Fix build (one more coming up) 2002-05-31 15:34:12 +00:00
Andi Gutmans 478ed1cf82 - Fix build 2002-05-31 14:32:19 +00:00
Sebastian Bergmann 1020ecd5bb Add zend_objects_API.c to project. 2002-05-31 14:24:57 +00:00
Brad LaFountain fa60d31d27 Changed PHP_EXPORTS to DOMXML_EXPORTS as Edin Kadribasic suggested 2002-05-31 13:38:58 +00:00
Stanislav Malyshev f75f3cff82 Generalize object storage and reference bookkeeping 2002-05-31 12:09:19 +00:00
Harald Radi d3383bab2d added wez to the com extension 2002-05-31 10:06:19 +00:00
Harald Radi d1b01b92ab added wez and ordered names alphabetically 2002-05-31 09:43:22 +00:00
Venkat Raghavan S ecdbaeced1 Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typecasting is done for all platforms. 2002-05-31 09:07:12 +00:00
Derick Rethans f3c71c43b0 - Don't issue a notice when no file was uploaded 2002-05-31 09:05:39 +00:00
Brad LaFountain 5313321e08 initalize variable in domxml_doc_document_element() 2002-05-31 06:14:29 +00:00
Brad LaFountain 2eb29ca917 defined PHP_EXPORTS for exporting php_domobject_new() 2002-05-31 06:01:50 +00:00
Brad LaFountain e6fa086537 added the ability to use new keywork with domxmls objects "new DomDocument()"
instead of xmldoc. This also allows you to create nodes without having
  a whole document "new DomElement("foo")".

moved DOMXML_API_VERSION to php_domxml.h
exposed php_domobject_new for other extensions to use
removed some un-needed code
2002-05-31 05:58:40 +00:00
Venkat Raghavan S 575e3682f5 NetWare related changes 2002-05-31 04:49:45 +00:00
Venkat Raghavan S c4fd805ce4 NetWare related additions / changes to build mod_php 2002-05-31 04:42:02 +00:00
4ef5f9ec71 NEWS update 2002-05-31 00:24:41 +00:00
6d1a3716dd ChangeLog update 2002-05-31 00:23:07 +00:00
Harald Radi acc1021f0d #forgot something 2002-05-30 23:17:48 +00:00
Harald Radi d3ca5abab7 @ Added missing AddRef() calls in the COM extension. This should
@ fix weird behaviour (in particular with ADODB). (Harald)

# waah, this suxx
2002-05-30 23:07:23 +00:00
Sander Roobol 219aa68a30 Add missing .cvsignore 2002-05-30 14:47:00 +00:00
Markus Fischer 39f16dbc65 - Tell the user why his session doesn't work if he uses custom session_id()s. 2002-05-30 11:41:37 +00:00
Markus Fischer 82cc9a9404 - Typo
# Zorflix!
2002-05-30 10:24:52 +00:00
Markus Fischer 3d81af807d - Give some useful updates to Win32/Apache/PHP4 installation. Also mention
strace for advanced users.
# Probably a lot of spelling/grammar errors, feel free to correct, thx.
2002-05-30 10:16:16 +00:00
Den V. Tsopa 509df14ff4 Fixes some dummy errors (again). 2002-05-30 10:10:16 +00:00
Jan Lehnardt 57adfb0dec - add testcase for PEAR::delExpect() 2002-05-30 09:39:52 +00:00
Venkat Raghavan S bc95839f19 NetWare changes 2002-05-30 08:52:21 +00:00
Venkat Raghavan S b47980e0ce NetWare changes for ZE2 2002-05-30 08:50:33 +00:00
Cliff Woolley 46eeabccf7 That macro is and always was hopelessly broken, which is why it's
now deprecated.
2002-05-30 06:07:28 +00:00
26812c4902 NEWS update 2002-05-30 00:28:00 +00:00
e996b83167 ChangeLog update 2002-05-30 00:24:32 +00:00
Jan Lehnardt 5ec88a3b73 - minor improvement of readability,
#thanks richy ;)
2002-05-29 21:55:52 +00:00
Jan Lehnardt 998ef91cad - added delExpect() API method. It allows to unset one or more expected
- error codes.
 - requires _checkDelExpect() (private) which I added as well.
 - inspired by chregu (PHP-Deluxe, page 75)
2002-05-29 21:41:27 +00:00
Den V. Tsopa 1da8768cae Added GB2312 alias for CN-GB 2002-05-29 09:15:28 +00:00
Venkat Raghavan S c61598f32b Changes to build TSRM on NetWare 2002-05-29 08:41:21 +00:00
Derick Rethans b049f9bf17 - Fix for bug #17503 2002-05-29 08:40:43 +00:00
Den V. Tsopa 9cd5bf77a7 @Fixed some dummy errors. (dets) 2002-05-29 08:33:23 +00:00
Venkat Raghavan S ab699a7c2b Change to build on NetWare: TSRM_CONFIG.H not required 2002-05-29 05:16:58 +00:00
Venkat Raghavan S 423eca4e05 Changes to build Zend on NetWare 2002-05-29 05:16:17 +00:00
1d790e4916 ChangeLog update 2002-05-29 00:26:35 +00:00
Andrei Zmievski c174a15a60 Fix a bug in case statement. 2002-05-28 16:30:16 +00:00
Venkat Raghavan S f3bfe97520 SDK directory path change 2002-05-28 09:25:57 +00:00
Venkat Raghavan S d69261d12c Basic NetWare changes 2002-05-28 08:54:17 +00:00
Venkat Raghavan S c223987fa2 Makefiles and batch file required to build Zend and TSRM 2002-05-28 06:51:10 +00:00
Venkat Raghavan S dd1bf198dc *** empty log message *** 2002-05-28 05:33:08 +00:00
Stig Bakken 43beb1deda * 0.11 release coming up 2002-05-28 01:22:41 +00:00
Stig Bakken a0b0ad161f * drop package-info command (deprecated by "info") 2002-05-28 01:21:47 +00:00
Stig Bakken 1ed83e4970 * update test 2002-05-28 01:21:26 +00:00
Stig Bakken ecf93ec1fd * update 0.11 release notes
* move build logic into PEAR_Builder
2002-05-28 01:01:43 +00:00
Stig Bakken 599cede43e * disable *&$^*#@ runtime ^@#*&$@ magical ^*!@@!! quoting 2002-05-28 00:45:19 +00:00
Stig Bakken 0adf7e2530 * sync up 2002-05-28 00:35:16 +00:00
Stig Bakken 52a00c9a0c * disable magic_quotes_runtime (what a broken concept!!) while
reading config files
2002-05-28 00:31:04 +00:00
7917b3f253 ChangeLog update 2002-05-28 00:21:26 +00:00
Stig Bakken 819dd35055 * fix some errors/warnings
* install data and test files now
2002-05-28 00:11:41 +00:00
Stig Bakken 245ca5aa7c * added data_dir and test_dir 2002-05-28 00:01:19 +00:00
Stig Bakken 926dcdc854 * moved the --without-pear compat defines to the right place 2002-05-27 22:28:26 +00:00
Stig Bakken 076202e02c * change root for documentation files to <peardir>/docs 2002-05-27 22:27:40 +00:00
Stig Bakken 731f6a2a97 * treat umask as octal in "config-set" command 2002-05-27 21:59:19 +00:00
Stig Bakken 216986ff42 * use new Archive_Tar gzip autodetection 2002-05-27 21:36:28 +00:00
Stig Bakken 1794f9c922 * prepare 0.9 release 2002-05-27 20:57:01 +00:00
Stig Bakken 94ca53c871 * fixed a bug in PEAR_Config::set() that broke validation of "set" parameters 2002-05-27 19:37:17 +00:00
Stig Bakken 3337c2d307 * better gzip detection (magic cookie) 2002-05-27 19:28:09 +00:00
Andi Gutmans 65b11e4aae - Hope this is the last commit in the series. Make sure that the .h file
- also goes into ext/standard. I'm not sure how 4.2.1 was built with these
- broken files
2002-05-27 14:47:03 +00:00
Andi Gutmans 1fa0bd479a - One more try. 2002-05-27 14:07:41 +00:00
Andi Gutmans 8b95b42bd0 - Isn't Makefile.frag being called? (Weird) 2002-05-27 14:01:10 +00:00
Andi Gutmans 13a6426bd6 - Be a bit more verbose 2002-05-27 13:36:43 +00:00
Hartmut Holzgraefe f404c23b5f moved to PECL 2002-05-27 13:14:02 +00:00
Stig Bakken a618f2cd8b * fixes for php without zlib 2002-05-27 12:45:03 +00:00
Stig Bakken f3c5fea7a4 * make Archive_Tar auto-detect whether zlib is needed based on file
extension (.tar -> no zlib)
2002-05-27 11:59:09 +00:00
Andi Gutmans d351f618fc - Small update 2002-05-27 05:48:01 +00:00
Stig Bakken e59a6c28d5 * update version 2002-05-27 01:22:59 +00:00
Stig Bakken 622c684164 * first shot at "pear build" command for building extensions from C code 2002-05-27 01:20:10 +00:00
735f4a129f NEWS update 2002-05-27 00:24:21 +00:00
84439fe2dd ChangeLog update 2002-05-27 00:23:53 +00:00
Stig Bakken 5f7cdc85da * "info" command 2002-05-27 00:22:01 +00:00
Stig Bakken cb097ffded * added config-help command 2002-05-27 00:21:36 +00:00
Stig Bakken 17e6e108ac * drop "any" as a valid preferred_state 2002-05-27 00:20:03 +00:00
Stig Bakken d4eb209a6a * more verbose docs for "verbose" :) 2002-05-27 00:16:40 +00:00
Stig Bakken d0cfe03194 * un-indent description too 2002-05-26 23:38:22 +00:00
Stig Bakken 0f26462418 * try being smart about de-indenting release notes from the xml 2002-05-26 23:33:01 +00:00
Stig Bakken 6e462e2880 * PEAR_Frontend_Web is coming! 2002-05-26 22:11:17 +00:00
Andi Gutmans 6e4c046025 - Small fix 2002-05-26 21:26:38 +00:00
Andi Gutmans 779c11af21 - Update genfiles for new build system 2002-05-26 21:05:38 +00:00
Tomas V.V.Cox 25b78bc5bd Added "pear -V" (show version information) 2002-05-26 19:42:13 +00:00
Stig Bakken d3926c1e7e * another help fix 2002-05-26 19:19:34 +00:00
Andi Gutmans 459c6d0fd6 - Add empty zend_multibyte.c to allow build with 4.3.0-dev. 2002-05-26 19:17:49 +00:00
Tomas V.V.Cox 8cd936095b Make the error handling work again since the new internal command
structure
2002-05-26 19:08:21 +00:00
Martin Jansen e75fe514a1 * Add /me has helper. 2002-05-26 18:06:04 +00:00
Stig Bakken 5819f202f9 * bold column headings 2002-05-26 17:48:40 +00:00
Stig Bakken 457af88cf4 ^t 2002-05-26 17:46:21 +00:00
Tomas V.V.Cox f2f69974e9 "Help" fixes 2002-05-26 17:37:52 +00:00
Edin Kadribasic 2d953b348a Merge from cli. 2002-05-26 13:12:30 +00:00
Stig Bakken 177872f0a5 * add package.dtd to the distribution 2002-05-26 12:56:11 +00:00
Stig Bakken 7168cb0567 * roll out 0.10 2002-05-26 12:54:19 +00:00
Stig Bakken c4e4b05c05 * focus on the present 2002-05-26 12:54:08 +00:00
Stig Bakken a12d71be8a * add @nodep stuff here too 2002-05-26 12:53:26 +00:00
Stig Bakken d6881ebba1 * be nice to PEAR_Common::detectDepdencencies() 2002-05-26 12:52:16 +00:00
Stig Bakken e71d497bef * more work on the dependency detector 2002-05-26 12:51:32 +00:00
Stig Bakken f1882b9fc5 * Console_Getopt POSIX fix 2002-05-26 12:51:10 +00:00
Stig Bakken ea14cadea2 * phpdoc fixes (un-break the broken) 2002-05-26 12:50:36 +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
Stig Bakken 39ba363638 * POSIX getopt compatibility support (first argv element is the command) 2002-05-26 12:13:47 +00:00
Stig Bakken 6b2d3bba17 * tidy output a bit 2002-05-26 12:13:05 +00:00
Stig Bakken 90efd3abe6 @Fix segfault in version_compare() (Stig) 2002-05-26 12:01:30 +00:00
Stig Bakken 7132d9e56f * cleaned up error handling in _installFile 2002-05-26 11:46:11 +00:00
25c43a6bbe ChangeLog update 2002-05-26 00:18:45 +00:00
Martin Jansen cbdcb20b37 * Make rel_trans from doPackageInfo globally available.
* Add command "package-dependencies" (shortcut "pd") to list the
  dependencies of a package.
2002-05-25 09:03:19 +00:00
Stig Bakken 0aa275f3ae * typo caught by PEAR_Common::detectDependencies :) 2002-05-25 00:43:58 +00:00
6e3b6d0cf8 ChangeLog update 2002-05-25 00:21:35 +00:00
Rui Hirokawa d3012238bc reverted my patch. 2002-05-24 22:30:24 +00:00
Rui Hirokawa ee480a7ec8 reverted patch to support iso2022kr. 2002-05-24 22:28:42 +00:00
Sander Roobol b80c27f7ae Fix <head> and <body> tags in phpinfo() output (#17411) 2002-05-24 17:25:40 +00:00
Sebastian Bergmann a014080299 Fugbix typo. 2002-05-24 08:46:32 +00:00
Andi Gutmans f657df14be - Add a bit of information. 2002-05-24 08:32:18 +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
aafc03c45b NEWS update 2002-05-24 00:28:11 +00:00
75ea340506 ChangeLog update 2002-05-24 00:26:45 +00:00
Derick Rethans de2c71e7cb - Added support for compressed SWF (Flash MX) files to getimagesize().
(Fixes feature request #17272).
@- Added support to getimagesize() for compressed Flash MX files. (Derick)
2002-05-23 21:48:27 +00:00
Tomas V.V.Cox 6ec69deaf6 TODO++
Check dependencies break on package uninstall (when no force given)
2002-05-23 20:42:33 +00:00
Tomas V.V.Cox 5ab1f810b9 Fix package dependency check (reported by Rasmus) 2002-05-23 20:37:58 +00:00
Andrei Zmievski 001b4c71e4 This code adds string offset capturing in preg_split() results. Original
patch by David Brown, modified by me.
2002-05-23 17:22:05 +00:00
Andi Gutmans fc059f5e40 - Fix typo 2002-05-23 14:28:14 +00:00
Wez Furlong e202ad5c8b Add simple test case for proc_open 2002-05-23 10:46:06 +00:00
Wez Furlong 4fd00c9502 Fix (stupid) segfault. #17379 2002-05-23 10:17:07 +00:00
Derick Rethans 708f980389 - Fix unchecked return values with parameters to proc_open. (Fixes
bug #17375)
2002-05-23 07:52:03 +00:00
Derick Rethans c37d2a97ac - Fix errormessage and whitespace 2002-05-23 07:08:25 +00:00
Yasuo Ohgaki b768cf0322 Added 4th parameter to specify enclosure character. Patch by Dean Richard Benson <dean@vipersoft.co.uk>
Spit more meaningful error messages when delim and/or enclosure char is null.
2002-05-23 07:03:43 +00:00
da1545b404 ChangeLog update 2002-05-23 00:25:48 +00:00
foobar dc26e8d8f5 Skip POST data if it is empty. 2002-05-22 23:40:29 +00:00
Andi Gutmans 19a5bcf297 - makedist script for creating Engine 2 distribution.
- Hopefully we can get a preview out in the next few days.
2002-05-22 15:51:48 +00:00
Tomas V.V.Cox 613f08a231 Trigger an error if the run-test.php file is not found
Make the run-tests pear cmd run with the CGI SAPI
2002-05-22 12:44:21 +00:00
Tomas V.V.Cox ae126450c9 Test first if the package exists before comparing the version
(fix the version_compare() segfault)
2002-05-22 01:23:12 +00:00
a5bdd68198 ChangeLog update 2002-05-22 00:26:48 +00:00
Tomas V.V.Cox 4d10d79c3e Make pear -vv XXX set the XML_RPC debug flag 2002-05-22 00:15:27 +00:00
Wez Furlong 64df5577bf Add README and CREDITS... 2002-05-22 00:03:02 +00:00
Wez Furlong 139fd6a8e4 Fix bug when length was queried before the string was converted. 2002-05-22 00:02:35 +00:00
Wez Furlong 762effcf60 Add documentation comment for properties in com_print_typeinfo 2002-05-21 22:44:10 +00:00
Wez Furlong fbf920d9a3 Enhance com_print_typeinfo.
The main expected use is like this, for figuring out what methods
are allowed for a COM object:

$ie = new COM("InternetExplorer.Application");
// Prints class definition for IE object
com_print_typeinfo($ie, "InternetExplorer.Application", false);
// Prints class definition for default IE event handler
com_print_typeinfo($ie, "InternetExplorer.Application", true);
2002-05-21 22:41:45 +00:00
Andrei Zmievski 634746ece9 *** empty log message *** 2002-05-21 21:24:09 +00:00
Andrei Zmievski f08e0ef9d4 Fix bug #16939. 2002-05-21 21:23:20 +00:00
Wez Furlong 8a53a89a94 Correct usage of convert_to_string_ex which is not allowed to zval* 2002-05-21 20:57:04 +00:00
Wez Furlong c05834fbce Reformat some comments. 2002-05-21 20:51:31 +00:00
Wez Furlong e2b9f0d964 Fix a flag, remove an old comment. 2002-05-21 20:46:08 +00:00
Wez Furlong e04d6ca9f7 - Make sure that COM and VARIANT resources are returned as resources
rather than longs.
- Make the IDispatch implementation a bit more generic (and
  fix my mess of pointers).
- Add new com_message_pump() function that acts like an interruptible
  usleep() that processes COM calls/events.
- Add new com_print_typeinfo() function for "decompiling" the typeinfo
  for an interface into PHP script.  This is useful for generating a
  skeleton for use as an event sink.
- Add new com_event_sink() function for sinking events from COM
  objects.  Usage is like this:

<?php

class IEEventSinker {
	var $terminated = false;

	function ProgressChange($progress, $progressmax) {
		echo "Download progress: $progress / $progressmax\n";
	}
	function DocumentComplete(&$dom, $url) {
		echo "Document $url complete\n";
	}
	function OnQuit() {
		echo "Quit!\n";
		$this->terminated = true;
	}
}

$ie = new COM("InternetExplorer.Application");

$sink =& new IEEventSinker();
com_event_sink($ie, $sink, "DWebBrowserEvents2");

$ie->Visible = true;
$ie->Navigate("http://www.php.net");

while(!$sink->terminated) {
	com_message_pump(4000);
}
$ie = null;
?>
2002-05-21 18:58:11 +00:00
Hartmut Holzgraefe 8a6f6fca1d ZTS issues fixed 2002-05-21 12:02:44 +00:00
Hartmut Holzgraefe 7f732313a7 not beautifull (yet), but should fix ZTS builds 2002-05-21 10:14:12 +00:00
Tomas V.V.Cox 743ad31884 files that are not installed should be removed from the
registered file list (TODO--)
2002-05-21 09:19:46 +00:00
Stig Bakken d8d42fcc59 * show installed_as instead of a "calculated" path for installed packages 2002-05-21 07:18:48 +00:00
Stig Bakken 86a043d250 * add TODO comment 2002-05-21 07:16:35 +00:00
Sebastian Bergmann ae6b6359d7 Add HAVE_MBSTR_RU support for Win32. 2002-05-21 07:15:42 +00:00
Sebastian Bergmann 4405b313c5 ZTS fixes. 2002-05-21 07:10:26 +00:00
Stig Bakken e7ccd22d5e * disable wrapping for now 2002-05-21 07:00:45 +00:00
Den V. Tsopa 4974e6073e Added russian codepages (koi8-r,cp1251,cp866) support. 2002-05-21 07:00:34 +00:00
Tomas V.V.Cox 5700c0d421 Some minor error verbosity updates 2002-05-21 02:31:23 +00:00
Tomas V.V.Cox 39b4baccbe doListRemote -> doRemoteList 2002-05-21 02:28:08 +00:00
Tomas V.V.Cox 2133d0f4ac Make the installation of a package fail when _installFile
fails and "force" is not set
2002-05-21 02:11:42 +00:00
Stig Bakken 6eb5ad0f53 * list command no longer displays test and data files when listing
installed files
2002-05-21 02:04:03 +00:00
Stig Bakken c8ea5b26d2 * package-list command no longer needed ("list" does the same thing and
more)
2002-05-21 01:44:06 +00:00
Stig Bakken cea551cf93 * rename shell-test shortcut to st (was stest) 2002-05-21 01:40:35 +00:00
Stig Bakken dd6b25cfcb * added more shortcuts 2002-05-21 01:38:50 +00:00
Stig Bakken 7ecfacedad * implemented shortcuts ("pv" for "package-validate" etc.)
do "pear help shortcuts" to see what shortcuts exist
* renamed "list-installed" command to "list" and made it able to
  list the contents of installed packages as well as tar/tgz/xml files
* added some more/better command docs
* fixed up the synopsis part in the help output
* display option parameters (--foo=bar, where bar is specified in
  'shortarg' as for example 'f:bar')
* renamed list-remote-packages to list-remote
* renamed remote-package-info to remote-info
2002-05-21 01:27:53 +00:00
Stig Bakken f208968c9f * make infoFromAny actually work :) 2002-05-21 01:20:51 +00:00
Stig Bakken 3cb61284ad * better wording 2002-05-21 01:20:24 +00:00
Edin Kadribasic 16e9e77e2a Fix for #17315. Requires client library 7.2 or greater to compile. 2002-05-21 01:03:13 +00:00
00211c2e0c ChangeLog update 2002-05-21 00:23:07 +00:00
Markus Fischer 94501132c6 - Fix posix_isatty() and posix_ttyname() (Closes #17323) 2002-05-20 23:26:13 +00:00
Stig Bakken d24f7420d0 * disable debug in XML_RPC fallback 2002-05-20 22:29:52 +00:00
Wez Furlong 3fca69809d Use the GIT for inter-thread marshalling. 2002-05-20 22:22:57 +00:00
Markus Fischer 601cf3690c - Add safe_mode/uid and open_basedir check to zip_open() (closes #16927). 2002-05-20 18:33:08 +00:00
Markus Fischer 720a890f84 - ZTS gotcha 2002-05-20 17:41:35 +00:00
Markus Fischer 96bf2d1deb - Add open_basedir check for all functions using php_stat() (filesize, stat,
etc), closes #11563.
2002-05-20 17:18:18 +00:00
Harald Radi 02a13a4ec4 this way it even compiles
#blame me if i did something wrong, i didn't test it ;)
2002-05-20 15:38:19 +00:00
Harald Radi e47a667cc9 integrating wez's patch 2002-05-20 15:35:57 +00:00
Stig Bakken 6553e94791 * new command setup 2002-05-20 11:37:33 +00:00
Stig Bakken 324c342527 * upgrade bundled XML_RPC package to 1.0.3 2002-05-20 11:35:33 +00:00
Stig Bakken 344ba505b9 * new installer rule that does not depend on bash 2002-05-20 10:46:01 +00:00
Stig Bakken 2034c61557 * _infoFromAny goes public! 2002-05-20 10:45:23 +00:00
Stig Bakken 840b5f8e67 * some verbosity changes: 0 - only errors, 1 - status report when the
install is done, 2 - show each operation, 3 - show file operations
2002-05-20 10:44:53 +00:00
Stig Bakken 9cd470d160 * no output in verbosity level 0 2002-05-20 10:43:29 +00:00
Stig Bakken 5c7623ee86 * added PEAR_Config::removeLayer() 2002-05-20 10:42:47 +00:00
Stig Bakken a31e8b7373 * remove getCommands() from here
* added options to "pear cvstag": -q -Q -d -F
2002-05-20 10:31:12 +00:00
Stig Bakken 454a31121c * support multiple -v and -q options 2002-05-20 10:27:16 +00:00
Stig Bakken b1bcf9d794 * forgot to update the release date 2002-05-20 10:21:01 +00:00
Stig Bakken fa6d66d6d2 * fix fix 2002-05-20 09:54:37 +00:00
Stig Bakken 9178695c37 * merge 0.4 files from /pear/Archive_Tar 2002-05-20 09:05:52 +00:00
Stig Bakken 89fb60f049 * prepare 0.10 2002-05-20 08:58:46 +00:00
Stig Bakken 845e6f86bc * remove run() from this class 2002-05-20 08:56:00 +00:00
Zeev Suraski 0450ab9462 MFZE1 (Expose more C++ APIs) 2002-05-20 07:17:30 +00:00
Wez Furlong bc068a9c99 This somehow got undone when I committed the rest... 2002-05-20 05:08:40 +00:00
Yasuo Ohgaki 62b8c29083 Fixed possible pg_lo_write() overflow and make it more fail safe. 2002-05-20 01:40:22 +00:00
Wez Furlong 935809872a Add activescript sapi to the workspace 2002-05-20 01:37:01 +00:00
Wez Furlong e754361405 Implement ActiveScript interfaces.
This allows use of PHP in:
  Client-side script in Internet Explorer
  Windows Scripting Host
  ASP and ASP.NET pages
It's mostly working... give it a go.
You will need to regsvr32 the php4activescript.dll manually.
2002-05-20 01:35:29 +00:00
Wez Furlong 50f7427e69 Protect C code with extern "C" 2002-05-20 01:32:48 +00:00
Wez Furlong fc964e88d3 Added generic COM wrapper for PHP objects. 2002-05-20 01:31:48 +00:00
Tomas V.V.Cox 3b97fe3657 Added missing key 'doc' for -Z help 2002-05-20 01:22:00 +00:00
Tomas V.V.Cox 3716f28350 Fix small bug making the baseinstalldir attrib persist 2002-05-20 01:17:09 +00:00
Yasuo Ohgaki c6873da401 Improve large object performance. pg_lo_read() and pg_lo_read_all() should perform
much better now.
Fixed Old API support for pg_lo_import().
2002-05-20 01:02:29 +00:00
2c9f3460dc ChangeLog update 2002-05-20 00:24:47 +00:00
Stig Bakken 7542066eef * no need for getCommands() here 2002-05-20 00:17:43 +00:00
Stig Bakken c2d1d3fc82 * new command setup 2002-05-20 00:15:52 +00:00
Stig Bakken 9fd5019fed * typo fixes, wrapping 2002-05-20 00:11:15 +00:00
Stig Bakken 71c7fe0d8f * install pear.bat on Windows only 2002-05-19 21:45:45 +00:00
foobar 14f05fbbc7 Make this actually work somewhat better.. 2002-05-19 21:39:59 +00:00
Edin Kadribasic 46cb400a3b Give due credit to Markus. 2002-05-19 16:58:05 +00:00
Stig Bakken f19b566a40 * compat fix 2002-05-19 16:32:18 +00:00
Markus Fischer f361189067 - Mention the availability of glob(). 2002-05-19 16:17:23 +00:00
Tomas V.V.Cox 93b603861e Put "pear help options" working again 2002-05-19 15:50:36 +00:00
Tomas V.V.Cox 26493531d4 Put "pear help command" working again 2002-05-19 15:44:47 +00:00
Sander Roobol 3f156fe6f9 Fix php.ini-related stuff in run-tests.php 2002-05-19 14:48:27 +00:00
Sander Roobol 751cd67cc0 get_cfg_var("get_file_path") didn't work correctly when an alternative
php.ini _file_ was specified using -c
2002-05-19 14:45:31 +00:00
Edin Kadribasic 544694255a Added glob() support for windows. 2002-05-19 14:32:24 +00:00
Sander Roobol 295e8e5bd4 It's get_cfg_var() not cfg_get_var() 2002-05-19 14:16:41 +00:00
Sander Roobol e3490f1429 Fix temporary filename problems, and update .cvsignores with new extensions 2002-05-19 13:54:37 +00:00
Sander Roobol f3a8a7d6bb Fix make test and remove a warning 2002-05-19 13:24:38 +00:00
Sander Roobol c9872c9199 Cleaned up run-tests.php, and fixed it on linux/unix
# and probably broke it on windows :)
2002-05-19 13:16:03 +00:00
Stig Bakken 6dce2376da * new command setup 2002-05-19 06:48:40 +00:00
Stig Bakken 6eee62645b * support platform-specific files 2002-05-19 06:19:26 +00:00
Stig Bakken d7ef0b964b * take uname as optional constructor parameter 2002-05-19 06:13:07 +00:00
8d6ee9ae84 ChangeLog update 2002-05-19 00:21:19 +00:00
foobar 9c0d95cde4 Typo fixes 2002-05-19 00:06:26 +00:00
foobar 3b9401a3ed DO NOT use C++ comments! 2002-05-19 00:02:07 +00:00
Christian Stocker ccd962e155 - delete attributes as well in php_free_xml_node
- more consistent naming in phpinfo()
2002-05-18 20:19:43 +00:00
Christian Stocker b692311fdd added "domxml API version" in phpinfo() output. 2002-05-18 17:07:59 +00:00
Christian Stocker def8bc92fc mem leak fix for domxml_dump_node 2002-05-18 14:38:22 +00:00
Christian Stocker 987ab91efb fixes memleak in html_dump_mem 2002-05-18 14:23:31 +00:00
Christian Stocker 81c8b8e7a4 rename the object name for comment nodes to domcoment 2002-05-18 14:21:46 +00:00
Markus Fischer 25a616d7aa - Fix portability issues with empty results on Linux and FreeBSD, add safe_mode
check and simplify code.
# Hartmut, what was the VCWD check for ?!
2002-05-18 13:31:31 +00:00
Christian Stocker 034d684089 WS fixes 2002-05-18 10:05:21 +00:00
Christian Stocker f275fe0b0b This should fix a big bad memory leak in freeing the nodes at script end. 2002-05-18 09:35:28 +00:00
ab5d1ccb9f ChangeLog update 2002-05-18 00:23:28 +00:00
Sascha Schumann d7edeee55f Improve readability of the header send function 2002-05-17 21:22:30 +00:00
Markus Fischer bd34eea40a - Stuff all Win32 mail() changes together. 2002-05-17 16:21:52 +00:00
Jon Parise 64eaef11ad Credit where credit is due. 2002-05-17 16:17:07 +00:00
Markus Fischer aec7987d9e - Win32 mail() is no longer case-sensitive when it comes to match for any headers
(e.g. from:, cc:, etc).
# Fixed also a crash I introduced earlier, which tells me no one tested it :)
2002-05-17 16:16:27 +00:00
Preston L. Bannister 34941b1ba6 Re-add "tests" project - this is the only change to file. For some reason MSVC chose to put "" around all the project file names. (Why? Ask Microsoft :). Perhaps different patch levels on MSVC6?). These files are not hand-edited. 2002-05-17 15:22:02 +00:00
Wez Furlong 7ae1630a97 proto tweak 2002-05-17 12:42:40 +00:00
Wez Furlong c347e0ce88 Add an optional flag to sem_get that specifies if the semaphore should be
automatically released on request shutdown. (#16986)
Fix a segfault in sem_remove (#17274)
2002-05-17 12:33:49 +00:00
Joseph Tate e8c2102659 Reverted the last commit which moved all the projects around.
#Preston, please re-add your make-test project, but this time don't move around
#the other projects in the process.
2002-05-17 09:13:45 +00:00
Cliff Woolley 8283979afc Allow the version checks for --with-apxs= and --with-apxs2= to work
with development version of Apache, whose version strings end in "-dev",
eg "Apache/2.0.37-dev".

PR: 17233
Submitted by: Dale Ghent <daleg@elemental.org>
2002-05-17 08:07:14 +00:00
Cliff Woolley 34d471d22e Only the last cookie was getting set. (You can have
more than one Set-Cookie: header, as indicated by
http://wp.netscape.com/newsref/std/cookie_spec.html.)

PR: 16626
Submitted by: regina@hitel.net
2002-05-17 07:10:19 +00:00
Cliff Woolley 57a4a7ed39 apache 2.0's apache_lookup_uri() was returning an array rather than an
object, which contradicted both the documentation and the behavior of the
same function under apache 1.3.

PR: 14999
2002-05-17 06:32:04 +00:00
Cliff Woolley 78cac2a42e * restore the php_flag and php_admin_flag Apache directives which for
some mysterious reason never made their way from sapi/apache to
  sapi/apache2filter when it was first written  PR: 16629
* change the allowed locations of php_admin_value (and php_admin_flag to
  match) to ACCESS_CONF instead of OR_NONE to match sapi/apache.  No
  idea why it was ever OR_NONE.  PR: 16489
2002-05-17 05:16:18 +00:00
Preston L. Bannister 3d4d3e3330 Default INI file used with run-tests.php 2002-05-17 03:43:18 +00:00
5107548856 NEWS update 2002-05-17 00:25:55 +00:00
df2dd9b1ce ChangeLog update 2002-05-17 00:23:24 +00:00
Christian Stocker 78acc6d865 - replaced domxml_doc_document_element implementation do use libxml2 method
- renamed domxml_add_root to domxml_doc_add_root (and added alias for BC)
- aliased $doc->get_root to domxml_document_element
@ - added domxml_doc_set_root to change the root node (Lukas Schroeder)
2002-05-16 21:59:26 +00:00
Preston L. Bannister 5c1d215976 More detailed/explanatory output. 2002-05-16 21:57:24 +00:00
Preston L. Bannister 285b73fa1f Make failed case tell you what was different. 2002-05-16 21:56:44 +00:00
Preston L. Bannister c2c16263e8 Make test valid for either "register globals" setting. 2002-05-16 21:56:08 +00:00
Preston L. Bannister e3ae02255b Restrict ctype tests to POSIX portable characters (0..127) and add numeric character tests. 2002-05-16 21:55:26 +00:00
Preston L. Bannister 1fdff888ce Remove leading "./" from include filenames as in PHP this defeats include_path. 2002-05-16 21:53:18 +00:00
Preston L. Bannister 90fa54c9d8 Add "tests" project to invoke run-tests.php (unit tests). 2002-05-16 21:49:50 +00:00
Preston L. Bannister 3d1d6022cd Updated to run cleanly on Win32, and perform a more controlled test. 2002-05-16 21:48:28 +00:00
Preston L. Bannister b1dbd42c4b Add TEST_PHP_DETAILED usage for verbose test runs. 2002-05-16 21:46:32 +00:00
Preston L. Bannister 7fa0e68dcc Fix typo in SKIP clause. 2002-05-16 16:07:47 +00:00
Preston L. Bannister 6b2ab5f66d Adjust dirname() on Win32 to match CWD per drive semantics. 2002-05-16 16:04:45 +00:00
Preston L. Bannister aa0702f051 dirname() checks that work for both Unix and Win32. 2002-05-16 15:59:39 +00:00
Rasmus Lerdorf adf701a3ef Grr.. I keep leaving my debug in... 2002-05-16 14:42:22 +00:00
Rasmus Lerdorf 5d286e21ea Fix for #17271
@ Fix crash bug in stripslashes() when working in sybase mode (Rasmus)
2002-05-16 14:41:15 +00:00
Preston L. Bannister 0b70f9e884 Range check arguments to mb_strcut().
Test ext/mbstring/013.phpt causes a hard failure w/o this.
2002-05-16 12:31:05 +00:00
Preston L. Bannister 9d3ed920b5 Proper declaration to suppress compiler warning. 2002-05-16 12:07:11 +00:00
foobar 2f12941fac - Made all is_*() functions to return only boolean values.
- Killed the "file not found" error for is_link(). (finally..)
2002-05-16 01:07:21 +00:00
87cf8f005d ChangeLog update 2002-05-16 00:20:06 +00:00
Preston L. Bannister e2da502e03 Win32 project and makefile used to invoke run-tests.php 2002-05-15 23:56:04 +00:00
Frank M. Kromann 7ca89cedf7 Fixing the mssql_query to handle multiple results correct if the first result does not return any data. 2002-05-15 18:07:17 +00:00
Harald Radi 37b9089bfa this should finally fix bug #14353 2002-05-15 17:59:48 +00:00
Frank M. Kromann bef1729fc6 Fixing line breaks 2002-05-15 17:40:28 +00:00
Frank M. Kromann b3d03499bd Fixing build of IMAP extension, after changes in sendmail 2002-05-15 17:39:41 +00:00
Markus Fischer 97cbaafead - Accommodate API changes to Ack(). 2002-05-15 13:13:17 +00:00
Christian Stocker 20226f71fc libxml2 >= 2.4.14 is needed (since quite some time ...) 2002-05-15 12:41:55 +00:00
foobar 25f6f239a2 Cleanup 2002-05-15 12:38:31 +00:00
Rui Hirokawa 19179736fa Added Chinese, Korean support in mbstring. 2002-05-15 12:16:15 +00:00
Rui Hirokawa 5f8009a7ea added ISO-2022-KR support in mbstring. 2002-05-15 12:13:56 +00:00
Tomas V.V.Cox fd5b0fb50a make downloadHttp() detect HTTP errors 2002-05-15 11:23:01 +00:00
foobar ce9fa7d326 MFB 2002-05-15 10:23:42 +00:00
foobar 370c985297 Nuke .1 2002-05-15 10:20:02 +00:00
foobar d6d4b7dd9a Added ctype to this list too. 2002-05-15 10:13:22 +00:00
Markus Fischer 03faaee849 - Add support for Bcc in w32/sendmail code. 2002-05-15 10:11:33 +00:00
Derick Rethans c2f2a0a86c - It's bundled, thus not experimental anymore 2002-05-15 05:25:16 +00:00
83fa712789 NEWS update 2002-05-15 00:31:44 +00:00
96ee1ce75d ChangeLog update 2002-05-15 00:30:34 +00:00
Frank M. Kromann 8d4097b29c Fixing hanfling of data type REAL.
Remove extra bytes allocated by emalloc calls
2002-05-14 23:57:43 +00:00
Rui Hirokawa e0a10acf8f fixed a initialization bug in euc-tw. 2002-05-14 21:42:46 +00:00
Sascha Schumann 9d17c42d77 some versions of autoconf pad CONFIG_FILES with a single space.
accomodate that

Thanks to Cliff Woolley
2002-05-14 20:53:33 +00:00
Markus Fischer 9b86cff931 - Adjust for improved error messages from win32/sendmail.c 2002-05-14 20:43:48 +00:00
Markus Fischer 7a0866ff90 - Improve code so errors returned from the server are reported back to the user.
# Testers, testers, testers!
2002-05-14 20:40:39 +00:00
Tomas V.V.Cox d9f4162ab9 Try to create the dir where the conf file resides before trying
to write to it
2002-05-14 17:59:41 +00:00
Tomas V.V.Cox 5ea5758bcf Add "\n" after the error in usage() 2002-05-14 17:58:44 +00:00
Andi Gutmans 1fe8df14c6 - constructor_called is supposed to be destructor_called 2002-05-14 16:15:50 +00:00
Markus Fischer b63236bd84 - Do not include the Cc: for the first Cc'd recipient (spotted by Richard). 2002-05-14 16:03:40 +00:00
Markus Fischer e3974c36ba - Convert unix to dos line endings.
# This is *really* annoying ... can only be an advantage for windows users imho.
2002-05-14 15:32:15 +00:00
Markus Fischer 0815b55950 - Try to find From: field in header, fallback to sendmail_from php.ini setting
(Original patch by Michael Sisolak <msisolak@yahoo.com>, enhanced a bit).
@- Win32 mail() supports parsing 'From:' field from header (msisolak@yahoo.com, Markus).
2002-05-14 15:29:28 +00:00
Markus Fischer 87286cdb3f - Fix win32 sendmail bug with Cc: in custom header not terminated with \r\n
- Fix some obvious errors returned by the module, little cleanup.
2002-05-14 13:52:18 +00:00
Stig Bakken ce2b2b76a0 * convert to new command setup 2002-05-14 12:46:17 +00:00
Stig Bakken b45e7182a0 * typo 2002-05-14 12:34:49 +00:00
Jan Lehnardt 46c5e3bc6f - fix typo, thanks to georg for spotting it. 2002-05-14 10:33:30 +00:00
Stig Bakken a14aeac0f8 * fall back to XML_RPC if xmlrpc-epi is not loaded
# still buggy
2002-05-14 01:51:06 +00:00
Stig Bakken 95ab15f0a5 * add command definitions, split run() into one method for each command 2002-05-14 01:49:56 +00:00
Stig Bakken 677cda3ea4 * no need for getHelp() here anymore 2002-05-14 01:49:18 +00:00
Stig Bakken 1da524b016 * moved get{Help,Commands,Options} here 2002-05-14 01:48:20 +00:00
Stig Bakken ed16e64498 * moved the {config xxx} help message substitution to
PEAR_Command_Common::getHelp
2002-05-14 01:45:20 +00:00
3e1a68277d ChangeLog update 2002-05-14 00:27:31 +00:00
Jason Greene e2c80df0dd Fix fastcgi build, may need more work
# Sascha, would you mind looking this over?
2002-05-14 00:07:51 +00:00
Marko Karppinen 5a5767e1d6 Patch by Justin Erenkrantz <jerenkrantz@apache.org> for enabling
--with-apxs2 build on Darwin. Omitting the change to start linking
with libtool for now, though.
2002-05-13 21:37:52 +00:00
Rasmus Lerdorf 01835e0469 fix copyresampled bug in bundled gd lib 2002-05-13 20:20:16 +00:00
Jim Jagielski 8006ee79a3 More verbose but more generic error message when we spot multiple
PHPINIDir directives
2002-05-13 19:22:27 +00:00
Rasmus Lerdorf f81ec94ac0 Make sure newtime is never NULL 2002-05-13 18:11:27 +00:00
Jan Lehnardt 8e19b31b24 - added reference to http://cvsbook.red-bean.com/ 2002-05-13 18:09:56 +00:00
Zeev Suraski 1bfb3595a8 - Fix a buglet in printing of GPCSE arrays
- Remove indirect access
2002-05-13 17:43:04 +00:00
Andrei Zmievski 1668570e4d Changing email address. 2002-05-13 17:28:38 +00:00
Sander Roobol 6940f88aab Added confdefs.h which seems to be generated by configure 2002-05-13 15:25:39 +00:00
Sterling Hughes f796a26c80 MFZE1 2002-05-13 14:38:42 +00:00
Zeev Suraski 2260e1742d - Centralize html_puts() again
- Revolutionize phpinfo()'s speed
2002-05-13 08:46:24 +00:00
Derick Rethans 4f77354ce0 - MFZE1 2002-05-13 08:41:55 +00:00
Jon Parise 9ec5aa9a92 Instead of calling mail_fetchheader_full() to retrieve the complete header
information just to extract the message envelope, call mail_fetchenvelope(),
which returns just what we need.

This is simpler, faster, and saves the IMAP server some work.

Submitted by: Adam Kauffman <adam.kauffman@mindspring.com>
2002-05-13 00:29:22 +00:00
80c6418119 NEWS update 2002-05-13 00:20:27 +00:00
bd6a7fc58e ChangeLog update 2002-05-13 00:20:08 +00:00
Stig Bakken 66605d218d * fix option parsing 2002-05-12 23:21:30 +00:00
Zeev Suraski 2369533bf9 Remove redundant code (thanks to Jani for pointing that out) 2002-05-12 22:17:58 +00:00
Stig Bakken 3bc12ac242 * refactored the command/options code:
- now each command class should define a "commands" property with
    documentation, option specs etc.
  - both long and short options are now supported
  - after recent changes to Console_Getopt, you may now have options
    to commands even though the same option is also valid for the pear
    command itself
  - less CLI-centric, better suited to Gtk and Web frontends
2002-05-12 21:09:04 +00:00
foobar d7e00e3285 sync with branch 2002-05-12 21:08:34 +00:00
foobar fa63185977 Made several entries comprehensible. 2002-05-12 21:00:13 +00:00
Jon Parise 066d417d69 @Improve IMAP performance when dealing with large mailboxes.
Submitted by: Rob Siemborski <rjs3@andrew.cmu.edu>
2002-05-12 20:53:25 +00:00
Sascha Schumann 226e1ed246 As far as I can tell, the AC_CHECK_MEMBER could not succeed,
because it does not include <sys/socket.h> which is necessary
for the definition of struct msghdr.  This include file is not
part of ac_includes_default.

Regardless, AC_CHECK_MEMBER is a autoconf-2.5x macro and thus we
expand it here for 2.13 compatibility.
2002-05-12 17:28:12 +00:00
Tomas V.V.Cox 94a3659642 The command name is now the first arg not the second 2002-05-12 16:42:50 +00:00
Tomas V.V.Cox 625b9c5f88 Add "r" in cmd help 2002-05-12 16:31:30 +00:00
Tomas V.V.Cox 1bf2abc2f5 The first entry in argv is the command name, so Getopt will stop
parsing more args
# Stig be carefull, your change to Getopt breaks BC
2002-05-12 16:30:26 +00:00
Rasmus Lerdorf 93af4bdfb7 Change safe-mode rule for rmdir() to match unlink() - allow is target
is opened by caller or in a directory owned by caller
@ Minor fix to rmdir() under safe-mode (Rasmus)
2002-05-12 15:59:42 +00:00
Zeev Suraski 2931bb640d MFZE1 2002-05-12 15:59:29 +00:00
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
Sebastian Bergmann 90229ba841 Nuke unused local variables. 2002-05-12 15:14:21 +00:00
Marko Karppinen 554b7684ed Add an option to calculate easter dates based on the Gregorian calendar
during the years 1582-1752. Earlier this was only possible from
1753 onwards. Use the optional parameter CAL_EASTER_ROMAN with
easter_days() to enable this. This is a fix for bug #12766.
# As you can see, my Sundays are *so* busy...
2002-05-12 15:06:04 +00:00
Sascha Schumann b3de60dbf0 Fix this again.
If you are unsure whether enable or with shall be used, please
inquire on the mailing list.

WITH is solely for the purpose of pointing to paths and other external
entities.

Note that the comment has always mentioned "--disable-mbstring" which
clearly refers to enable and not with.
2002-05-12 14:55:25 +00:00
Stig Bakken d0fc0d4c08 * fix up package dependency check 2002-05-12 14:53:54 +00:00
Sascha Schumann feaa12a9bf Use string_len information 2002-05-12 14:50:54 +00:00
Sascha Schumann a769454d79 reenable php_html_puts 2002-05-12 14:48:22 +00:00
Tomas V.V.Cox 3a838c7737 Make <dep type="pkg" rel="has"> avaible 2002-05-12 14:42:03 +00:00
Stig Bakken bd77586b34 * fix description 2002-05-12 13:14:24 +00:00
Rui Hirokawa 767fa10a92 added chinese HZ encoding support. fixed ascii area character conversion was not work in euc-cn and euc-kr. 2002-05-12 13:06:13 +00:00
Sascha Schumann 38ad391894 - Fix the way code was outcommented
- Remove unused STR_CAT macro
- Remove limits/tests based on unused macro
- Implement cache_limiter(private) using private_no_expire
2002-05-12 12:51:42 +00:00
Daniela Mariaschi 87148b6edd fix bug #17040 ibase_close again.....
User can't close a connection if there are blobs opened.
He must close them before to not loose data....
2002-05-12 12:18:56 +00:00
Tomas V.V.Cox 0e9d6c4b42 Vincent is not involved in this class :-) 2002-05-12 11:27:39 +00:00
Sebastian Bergmann 9f47b2f193 Rephrase. 2002-05-12 08:35:37 +00:00
Sebastian Bergmann 3fa1fd866f Beautify. 2002-05-12 08:33:18 +00:00
Sebastian Bergmann 92c71b5bb9 Start documenting the debug backtracing. 2002-05-12 08:16:14 +00:00
Sebastian Bergmann 571d93e16a Whitespace fixes. 2002-05-12 08:15:45 +00:00
Jason Greene 969d7e5a82 Fix build on IRIX for both mips and gcc 2002-05-12 07:22:47 +00:00
Stig Bakken ebe26ec36c * Try again: fixed Console_Getopt::getopt so it does not steal options
after the first non-option argument.  Added test.
2002-05-12 07:13:49 +00:00
Stig Bakken f0a3e7262e * updated config key names 2002-05-12 07:09:25 +00:00
Stig Bakken 201ec25f42 * exclude _lastmodified registry attrib from tests 2002-05-12 07:08:25 +00:00
Rui Hirokawa b3690bbe19 fixed to support --with-mbsting=LANG. 2002-05-12 00:26:43 +00:00
ca47c3d3b3 ChangeLog update 2002-05-12 00:23:15 +00:00
Markus Fischer 965b4c26f1 - Update about CLI default settings and it's weirdness. 2002-05-11 20:33:59 +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
Rasmus Lerdorf 465b2d54db Another safe-mode fix. parse_ini_file() did not check
@ safe-mode fix for parse_ini_file()  (Rasmus)
2002-05-11 19:19:49 +00:00
Rasmus Lerdorf 9cbcc9b822 show_source() safe-mode fix
@ show_source() was evading safe-mode - fixed (Rasmus)
2002-05-11 18:35:59 +00:00
Sterling Hughes e15a3c42f3 remove stale 1 2002-05-11 17:41:16 +00:00
Sterling Hughes 2e72f8cc1f WS Fixes (and similair stylistic changes) 2002-05-11 17:00:49 +00:00
Stig Bakken d9704c7134 * use PEAR::raiseError 2002-05-11 16:39:39 +00:00
Sterling Hughes 0a21aa12b2 allocate globals, making this work in zts mode
(not that it really matters, since libswf isn't thread safe...)
2002-05-11 15:58:55 +00:00
Markus Fischer 51ba96c603 - Update 2002-05-11 14:52:29 +00:00
Edin Kadribasic 8e15de012a Added copyright notice to php -v output. 2002-05-11 14:26:30 +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 4ec448e229 MFZE1 2002-05-11 12:36:32 +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 &nbsp;'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 70f72d0568 Fix dependencies for CLI module 2002-05-11 11:49:34 +00:00
Sebastian Bergmann 5192f6432c Patch by Justin Erenkrantz <jerenkrantz@apache.org>. This should be MFHed. 2002-05-11 08:58:20 +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
Zeev Suraski ce20564d1e whitespace 2002-05-11 03:33:29 +00:00
Zeev Suraski 70384bc755 Fix build 2002-05-11 03:22:02 +00:00
Markus Fischer c7a15e6388 - Fail gracefully and not just bail out with an error message from dirname
because no argument was given.
2002-05-11 03:11:46 +00:00
Yasuo Ohgaki f314d24d03 Reduce number of realloc calls. 2002-05-11 03:01:08 +00:00
Zeev Suraski 2d0f07d086 Add missing element 2002-05-11 02:58:43 +00:00
Edin Kadribasic cfd594e0ee Made ZIP extension available on Windows.
@- Made ZIP extension available on Windows. (Edin)
2002-05-11 02:12:44 +00:00
Stig Bakken aa1f45c964 * install Archive_Tar and Console_Getopt too 2002-05-11 01:35:23 +00:00
Stig Bakken b4bb7c10f9 * add package descriptions for Archive_Tar and Console_Getopt 2002-05-11 01:28:14 +00:00
Stig Bakken 42a0e2763f * add dependencies 2002-05-11 01:27:53 +00:00
b9d3ab65a6 NEWS update 2002-05-11 00:21:41 +00:00
548d89d449 ChangeLog update 2002-05-11 00:21:06 +00:00
Edin Kadribasic 3e42446692 Fixed "make install" when compiled with --disable-cli option. 2002-05-10 18:38:21 +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
Christian Stocker 827a769c28 @- added fifth optional parameter to domxml_xslt_process. If set,
it will output profiling information to the file stated (chregu)
- introduced version numbering for this extension
2002-05-10 14:59:14 +00:00
Andi Gutmans dc0bc97969 - Nuke C++ comment 2002-05-10 09:43:00 +00:00
Andi Gutmans b6219a0dbc - Make debug_backtrace() return an array. Still not finished because I
might want to differentiate between method calls and static methods.

Example:
$bt = debug_backtrace();
foreach ($bt as $frame) {
	if (isset($frame['class'])) {
		print $frame['class'];
		print "::";
	}
	print $frame['function'];
	print "   [";
	print $frame['file'];
	print ":";
	print $frame['line'];
	print "]\n";
}
2002-05-10 09:41:50 +00:00
Martin Jansen caa2dd2ce2 * package-pear.xml has been renamed to package-PEAR.xml. 2002-05-10 05:40:39 +00:00
Edin Kadribasic ffce791942 Added MD5 support for crypt() on Windows. 2002-05-10 04:58:05 +00:00
Edin Kadribasic 0685de942b Ignoring *.aps files. 2002-05-10 04:36:28 +00:00
Edin Kadribasic 51cb237aa6 Fix win32 build. 2002-05-10 02:39:37 +00:00
034685f258 ChangeLog update 2002-05-10 00:26:32 +00:00
Preston L. Bannister 57c5998ff9 Backed out preceding change. 2002-05-09 23:33:27 +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
Daniela Mariaschi cbb2dbb2e2 corrected parameter 2002-05-09 21:57:49 +00:00
Daniela Mariaschi f7d5d1036c fix test 5 to pass 2002-05-09 21:41:20 +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
Stig Bakken ae7da10f0e * remove package-db.xml
* rename package-pear.xml to package-PEAR.xml (generic format is
  package-PKGNAME.xml)
2002-05-09 21:13:56 +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
Frank M. Kromann f0141f965f Allow the MSSQL extension to use NT authentication 2002-05-09 20:37:45 +00:00
James Cox 1e55a42391 this is dangerous.... 2002-05-09 20:36:49 +00:00
Frank M. Kromann 31a16f63f9 Adding ini setting that allows the MSSQL extension to use NT authentication 2002-05-09 20:36:40 +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
Sander Roobol 375d7960a7 Revert Preston's patch 2002-05-09 20:02:47 +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 9fdec2e345 Change default directory for session data from /tmp (non-portable) to none.
Default directory for session data (if not specified) is same (platform-specific) directory used for temporary files.
This is backwards compatible and removes the need for explicitly specifying the session.save_path on Win32.
2002-05-09 19:42:00 +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
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
Edin Kadribasic 2e317ff727 No need to link libxm2 in order to build php_crack.lib 2002-05-09 15:58:19 +00:00
Vincent Blavet 59071dc42e * Better handling of Windows paths (\php\any_thing or c:\php\any_thing)
* Remember that inside the archive path are all the time in unix format /php/any_thing
* When necessary, '\' are replaced by '/' and 'c:' are removed
* Synchro with cvs:pear/Archive_Tar/Tar.php version 1.20
2002-05-09 13:00:12 +00:00
Stig Bakken 27f5bfc848 * add some packages to bundle with PHP 2002-05-09 12:46:21 +00:00
Stig Bakken fddbd15554 * add "pear run-tests" command 2002-05-09 12:45:29 +00:00
Stig Bakken ed4ffb695b * use PEAR installer to install stuff (won't overwrite if newer versions
of packages already are installed)
2002-05-09 12:45:02 +00:00
Stig Bakken 123ae9bcdd * permanently moving DB to /pear 2002-05-09 12:29:25 +00:00
Derick Rethans 24e96213ff - Fix phpize 2002-05-09 12:27:20 +00:00
Derick Rethans f0d18c63be - Dump API NOs 2002-05-09 12:11:57 +00:00
foobar 1d4753755d Fix 'php-config --version' 2002-05-09 12:06:44 +00:00
Derick Rethans f58ad95c00 - Add PHP_API_VERSION too 2002-05-09 11:56:52 +00:00
Derick Rethans 7b3ce60a23 - Show both API nos 2002-05-09 11:47:37 +00:00
Sander Roobol 7586cdc654 Added the current SAPI to the output of php -v 2002-05-09 09:36:45 +00:00
Stig Bakken dad70be69c * show "update ok" after updates 2002-05-09 06:49:12 +00:00
Stig Bakken fdb724bffc * try the installed cli binary if everything else fails (I'm starting
to agree that looking too hard for a php binary is wrong)
2002-05-09 06:39:05 +00:00
Stig Bakken 2225be36d6 * install the old-fashioned way for just a bit longer 2002-05-09 02:32:18 +00:00
Stig Bakken b14c2f9185 * add -G option to "pear" for php-gtk frontend
* added Gtk stub (only creates window right now)
* added command descriptions
2002-05-09 02:31:37 +00:00
9dece79266 ChangeLog update 2002-05-09 00:23:53 +00:00
Andi Gutmans 14a81f91e3 - Hopefully fix problems with debug_backtrace() 2002-05-08 18:43:19 +00:00
Jason Greene cfb285a391 Fix overflow 2002-05-08 15:30:04 +00:00
Derick Rethans b43ba8dfe2 - MFZE1 2002-05-08 14:10:30 +00:00
Rui Hirokawa a627c674c5 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 13:47:39 +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
Aaron Bannert 218c661c6c This is a more appropriate address for me. 2002-05-08 07:48:04 +00:00
Zak Greant 4128739695 Minor improvement to error message for mysql_data_seek 2002-05-08 07:38:09 +00:00
Markus Fischer 1a3c8e6289 - Add a warning if running with safe_mode enabled. 2002-05-08 07:23:54 +00:00
Derick Rethans 31d1fac578 - Forgot one 2002-05-08 05:19:27 +00:00
Derick Rethans dedf22f5ad - Added Aaron Bannert as maintainer 2002-05-08 05:17:59 +00:00
Frank M. Kromann c75e794ebe Kill a compiler warning on Win32 2002-05-08 03:56:43 +00:00
5a33b8ea01 ChangeLog update 2002-05-08 00:31:28 +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
Jason Greene d4b11fb33f Fix 10830, and 17074
FreeBSD requires the exact length of the socket type
2002-05-07 18:47:17 +00:00
Andi Gutmans b66c89c47a - More debug backtrace work. It still doesn't work very well... 2002-05-07 18:42:13 +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
abc72f2820 ChangeLog update 2002-05-07 00:22:21 +00:00
Jason Greene f30fefcb30 Fix invalid warning caused by bogus convert_to_* calls
Fix possible invalid data in status for pcntl_waitpid()
2002-05-06 23:01:46 +00:00
Markus Fischer ac876a4981 - WS fix as pointed out by fabwash@hotmail.com 2002-05-06 21:44:43 +00:00
Jason Greene 4c9dbf9335 Fix type-o that broke ZTS build
Fix 3 nasty crash bugs that could occur if pcntl_exec's call to execve errored
2002-05-06 19:48:39 +00:00
Derick Rethans ebede147aa - Fix release date 2002-05-06 18:54:46 +00:00
jim winstead 51e2ea5ed2 fix problem with mkdir() on freebsd 2002-05-06 17:31:22 +00:00
Edin Kadribasic d00252cf38 Update README with register_argc_argv settings override. 2002-05-06 15:49:06 +00:00
d3fa83a8a7 ChangeLog update 2002-05-06 00:23:00 +00:00
Wez Furlong a03d09e2d9 Add support for remaining entities in HTML 4 for the UTF-8 encoding in
htmlentities/htmlspecial chars.
This is a fix for for #17008.
# I would *really* appreciate it if someone with a good eye could verify
# that all the entities are there and are correctly numbered; I've checked
# it three times, but it's best to be sure.
2002-05-05 23:06:39 +00:00
Yasuo Ohgaki 3f93b56b5b Clenup before I forgot. 2002-05-05 22:44:07 +00:00
Aaron Bannert 8e176a10fc Fix a graceful restart SEGV. We no longer only perform initialization
on the second pass through the post_config. Now we only avoid the
initialization only on the first DSO load, and on all subsequent loads
we rerun the init code.
2002-05-05 18:15:33 +00:00
Aaron Bannert b759322411 Fix an elusive and intermittent startup SEGV. The problem was
the static string we were using to set an initialization flag
would get remapped to a different location when Apache reloaded
the DSO, causing us to not run our initialization routines.

Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: Aaron Bannert (I added the big comment too)
2002-05-05 18:11:41 +00:00
Stanislav Malyshev b67bafefa5 Return right exit status 2002-05-05 17:14:12 +00:00
foobar 5f13f4ecb7 Force register_argc_argv=On for CLI 2002-05-05 17:11:04 +00:00
Thies C. Arntzen 5d177788ea touch 2002-05-05 16:40:20 +00:00
Thies C. Arntzen 23251ebd1a re-add accidentily nuked session_adapt_url() 2002-05-05 16:39:49 +00:00
Rui Hirokawa b7321edb84 bug fixed in unicode -> cp1252 table. 2002-05-05 11:42:18 +00:00
Marko Karppinen b7e50782b7 Well that didn't last long! (Reverting previous.) 2002-05-05 09:52:39 +00:00
Marko Karppinen 32ff990c68 Prelim. patch to enable apache2filter to link on Darwin.
Submitted by: Justin Erenkrantz <jerenkrantz@apache.org>
Reviewed by: markonen
# A stopgap measure while we try to find a "real"
# solution, if one exists.
2002-05-05 09:40:31 +00:00
Rui Hirokawa 39c951ed88 added missing areas on Unicode->CP936 conversion table. added an alias CP932 on sjis-win. 2002-05-05 02:22:36 +00:00
Sascha Schumann 67d00f8c1d sync 2002-05-05 02:07:33 +00:00
Sascha Schumann c8f884fac8 the output buffer is flushed during request shutdown before it
reaches our rshutdown, so it is safe to delete the contents of
the url rewriter variables here.
2002-05-05 02:07:16 +00:00
e2de181cab NEWS update 2002-05-05 00:22:10 +00:00
2cb47c9326 ChangeLog update 2002-05-05 00:20:01 +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 d41773e8b6 update 2002-05-04 18:34:29 +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 ebfff2df7e ret set but unused 2002-05-04 18:11:36 +00:00
Sascha Schumann 4fe391cb91 these are case sensitive 2002-05-04 17:42:58 +00:00
Sascha Schumann 74b09cbcf8 c set but unused 2002-05-04 17:41:51 +00:00
Sascha Schumann 34b899e2da inheader set but unused 2002-05-04 17:41:11 +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 ea84524bc2 block_ended/opposite_target were set but never used 2002-05-04 17:38:45 +00:00
Sascha Schumann a6c3ce15ae don't emit code for version 2002-05-04 17:36:58 +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
Sascha Schumann 1ed3f698fe ap_php_optopt is set but never used 2002-05-04 17:27:18 +00:00
Sascha Schumann 1f09644ff7 Fix linkage of symbols 2002-05-04 17:26:45 +00:00
Sascha Schumann 9e91566179 entry_length was set but never used 2002-05-04 17:24:08 +00:00
Sascha Schumann 01c980980c update 2002-05-04 17:17:54 +00:00
Sascha Schumann 2438488c68 rval_temp was declared but never used 2002-05-04 17:17:43 +00:00
Sascha Schumann 140158734f redirected is set but never used 2002-05-04 17:16:28 +00:00
Sascha Schumann 62c54fca9f include url.h 2002-05-04 17:15:09 +00:00
Sascha Schumann 2a4dea6c18 include url.h to pull in declaration of php_url_encode 2002-05-04 17:14:56 +00:00
Sascha Schumann 4378214b80 Make this code work on compilers which don't consider the address
of a variable on the stack available at compile time.
2002-05-04 17:12:26 +00:00
Sascha Schumann e919e7e526 unused var 2002-05-04 16:59:41 +00:00
Sascha Schumann 3fbbd61dc2 p is set, but never used. 2002-05-04 16:54:13 +00:00
Sascha Schumann ee70764592 Turn misplaced PHP_ARG_WITH into _ENABLE
and fix --enable-mbstring=shared
2002-05-04 16:50:10 +00:00
Sascha Schumann 9517ff0689 Fix --enable-session=shared 2002-05-04 16:48:48 +00:00
Sascha Schumann 3c89ce7843 Fix --enable-xml=shared 2002-05-04 16:48:01 +00:00
Stig Venaas d47d8b99c5 Reworked result resource handling so that result is not freed until all
its result entry resources are freed
@- Fixed resource bug in LDAP extension. (Stig Venaas)
2002-05-04 14:27:48 +00:00
Rui Hirokawa fa1904b6e8 fixed a problem that ereg_replace() couldn't match with line stand/end marker. 2002-05-04 11:20:12 +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
4510592428 NEWS update 2002-05-04 00:38:22 +00:00
9a44bbf416 ChangeLog update 2002-05-04 00:32:52 +00:00
foobar 8270b16d6b Domxml changes go into the 4.2.x branch. 2002-05-03 21:30:58 +00:00
Sander Roobol b545125fde Adding missing .cvsignore 2002-05-03 19:17:21 +00:00
Christian Stocker d5c7421a7c removed the function for domxml_node_add_child and made an alias to
domxml_node_append_child for BC
2002-05-03 13:53:46 +00:00
Stig Bakken bd4f1f90d0 * switched from static to instance model
* added matching method with glob support, some examples:
    $os->matchSignature('linux');
    $os->matchSignature('linux-2.4*);
    $os->matchSignature('linux-*-i?86');
2002-05-03 13:13:51 +00:00
Christian Stocker e7f7fb1781 WS fixes 2002-05-03 09:51:06 +00:00
Christian Stocker 9c37ea1888 one parameter too much 2002-05-03 09:46:27 +00:00
Christian Stocker 67c5b2e4fd added encoding support for domxml_dump_mem() 2002-05-03 09:45:09 +00:00
Thies C. Arntzen 023a381323 forgot 2002-05-03 08:32:03 +00:00
Sebastian Bergmann 8193ca7891 Fix ZTS build. 2002-05-03 08:10:43 +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
Stig Bakken 9679267b88 * fixed autoconf vs. pear installer replacement issue in scripts/pear.in
(pear installer now substitutes "@prefix@/bin" to bin_dir ;-)
* added skeleton for OS_Guess class
2002-05-03 05:42:55 +00:00
Stig Bakken 919edc49a5 * unintentional news entry :-) 2002-05-03 05:32:52 +00:00
7ede88560d NEWS update 2002-05-03 00:24:52 +00:00
71eb0ed198 ChangeLog update 2002-05-03 00:24:03 +00:00
Stig Bakken 1a74e43001 * apply umask when installing files 2002-05-03 00:01:54 +00:00
Stig Bakken f6ad0eee1d * add umask config value 2002-05-02 23:56:44 +00:00
Frank M. Kromann 810c9dd963 Changed & to &&. 2002-05-02 17:54:54 +00:00
Frank M. Kromann e789e72515 Adding missing files to the project 2002-05-02 17:53:42 +00:00
Frank M. Kromann bd75b407cf Fixing wrong pointer 2002-05-02 17:36:00 +00:00
Andi Gutmans 7e5ec2d761 Initial support for built-in backtracing.
There are still a few problems such as includes and calling other functions
from internal functions which aren't seen (will have to think if and how to
fix this).
Also the main scripts filename isn't available. Need to think about that.
2002-05-02 17:20:48 +00:00
Sander Roobol 7a64b2b7e5 Fixed some minor typos 2002-05-02 17:19:42 +00:00
Jason Greene 89c59569ba socket_write() should just use the standard socket error macro so that errors will be consistent if the macro ever changes 2002-05-02 16:45:22 +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
Zeev Suraski d0ae80a9de Update comment 2002-05-02 14:05:26 +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
Harald Radi fe84a29b3f remove temporary resources immediately
return value fix

#thanks to alan for 'remote debugging'
2002-05-02 13:37:31 +00:00
Sascha Schumann 830f094933 Readd warning
If Mr. Taskinen feels like removing it again, he can commence a
discussion.  Otherwise, I'll personally disable his CVS account
immediately.
2002-05-02 13:21:38 +00:00
Sascha Schumann a79e2de3a7 in6addr_any is defined as extern in IRIX header files, but is not actually
contained in any library (sigh).

Make this check fail, if the link stage does not succeed.  Also avoid
GCC optimization which drops the reference to ip6addr_any.

Tested on IRIX 6.5.15.
2002-05-02 13:12:44 +00:00
Derick Rethans 0c16e026b0 - Add Zend API No. to phpinofo() output 2002-05-02 12:33:03 +00:00
foobar 399914da92 Stop the search when the libs are found. 2002-05-02 10:22:26 +00:00
Tomas V.V.Cox fec42ddeee Install pear.bat
# Please Windows hackers test the pear installer support!
2002-05-02 10:15:47 +00:00
Sebastian Bergmann 31c722f859 I could swear it worked the other way before I committed. 2002-05-02 10:15:27 +00:00
Tomas V.V.Cox f024d6b709 untabify 2002-05-02 10:14:01 +00:00
James Cox 2677efe372 englishify. 2002-05-02 10:05:24 +00:00
Sebastian Bergmann bed2bc7dbc Add config.w32.h. 2002-05-02 09:57:45 +00:00
Sebastian Bergmann b1246493f8 Oops. 2002-05-02 09:53:17 +00:00
Sebastian Bergmann 93ab7ea64e Fugbix typos. 2002-05-02 09:51: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
foobar 5035904efc Remove bogus warning. 2002-05-02 08:31:55 +00:00
foobar 4987ef5f22 Sync with PHP_4_2_0 branch. 2002-05-02 08:30:29 +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
Jon Parise b2579d3480 Revert the previous commit (revision 1.40).
@bindir@ ended up becoming '${exec_prefix}' (literally) on my system
(FreeBSD 4.5), thus producing a broken shebang line.

@prefix@ works fine for me here.  If @bindir@ is indeed preferred, the
substitution problem noted above needs to be resolved before the change
is reapplied.
2002-05-02 05:36:21 +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 cbf8a26d53 Modify NEWS entry for Content-Length header change 2002-05-02 01:15:30 +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
f46c152775 NEWS update 2002-05-02 00:25:56 +00:00
646991d39b ChangeLog update 2002-05-02 00:23:16 +00:00
Derick Rethans 8fe3c0c5d4 - Fix String is not zero-terminated error in base64_decode 2002-05-01 20:11:09 +00:00
Markus Fischer 07efbff856 - Update protos for socket_read() and socket_write().
- Set last_error in socket_write().
2002-05-01 16:38:22 +00:00
Markus Fischer ae5bc7c0f6 - Update protos for getpeer/getsock-name. 2002-05-01 16:08:50 +00:00
Jason Greene 38a6325178 Fix BYREF_FORCE that was not being read
Fix error message
2002-05-01 15:14:49 +00:00
Sascha Schumann 303b62ae47 Add a big disclaimer regarding register_globals. It just bit me again
but now on a live customer site :-/
2002-05-01 13:34:05 +00:00
Markus Fischer 1a5501ddfd - Rename setopt and getopt to set_option and get_option, provide alias. 2002-05-01 11:08:08 +00:00
Markus Fischer a2fbdad20e - Fix couple of problems with socket_create_pair():
- Force fourth argument to be passed by reference
  - Since the argument is modified there is no need to force it to be an array
    since it's destroyed anyway
  - Only modify the argument if socketpair() was successfully
  - Fix string modified for error message message
  - Set global last_error when socketpair() fails
2002-05-01 10:41:10 +00:00
Markus Fischer 7ee9e9d9e5 - Add SOMAXCONN constant. 2002-05-01 09:25:26 +00:00
Wez Furlong 3a68052828 Fix for #16885 2002-05-01 08:22:17 +00:00
Wez Furlong f571438d7a Probable fix for #16940. 2002-05-01 07:50:13 +00:00
Markus Fischer cc4ff9c3ac - WS fixes 2002-05-01 07:35:01 +00:00
Jason Greene 9a841d116b Changed socket_select to force reference copy, the older code would modify all references
@Fixed a bug in socket_select() that could cause unexpected behavior when using a statement
@ like $w=$e=array($sock);
@This change unfortunately prevents the use of constant values(NULL) for the socket array paramaters.
@Instead use a temporary variable or an expression with the leftmost member being a temporary variable.
@ ex. socket_select($w, $r, $e=NULL, 10);

Also fix small memory leak.
2002-05-01 04:46:59 +00:00
d6f87556b5 ChangeLog update 2002-05-01 00:49:54 +00:00
Harald Radi 6055c2b11a ZE2 compatibility fixes 2002-04-30 23:34:09 +00:00
Markus Fischer a369d06bea - Forgot to update proto 2002-04-30 22:03:51 +00:00
Markus Fischer c1c1ee9f6e - Allow resetting the module global last_error too. 2002-04-30 22:01:06 +00:00
Sebastian Bergmann 92748918c5 More unused variables. 2002-04-30 15:21:04 +00:00
Stanislav Malyshev f42bb6cfe4 Fix ZE1 build 2002-04-30 14:45:50 +00:00
Sebastian Bergmann 28e1120978 Fix ZTS build. Remove unused variables. 2002-04-30 14:36:43 +00:00
Sebastian Bergmann 71872d8ec3 Add missing #define's. 2002-04-30 14:36:02 +00:00
Harald Radi 9d650c093a # fooblah 2002-04-30 14:31:33 +00:00
Sebastian Bergmann aff6d565f4 Add new ext/mbstring/mbfilter_*.c files. 2002-04-30 14:29:10 +00:00
Sascha Schumann 6f57419453 Touch file 2002-04-30 13:47:16 +00:00
Dan Kalowsky d55c9134c8 reverting the cursor change as it seems to break many ODBC drivers. 2002-04-30 13:17:48 +00:00
Rui Hirokawa 813a795c64 fixed compile warning with Visual C++. 2002-04-30 12:45:14 +00:00
Rui Hirokawa 5df01432c7 added simplified chinese, traditional chinese, korean support to mbstring. Note that this feature is experimental. 2002-04-30 12:00:42 +00:00
Stanislav Malyshev 18805e8323 ZE2 compatibility fix 2002-04-30 11:30:07 +00:00
Stanislav Malyshev 3dd6217c0b ZE2 compatibility fixes 2002-04-30 11:29:28 +00:00
foobar 3b1ae7c62a revert last bogus change. There is bug in is_file() 2002-04-30 10:38:06 +00:00
Stanislav Malyshev 7a067547cd Make OBJCE return zend_class_entry*, also some cleanups 2002-04-30 09:56:48 +00:00
Uwe Steinmann 3858221c2f - added function domxml_parser_set_keep_blanks() 2002-04-30 05:18:12 +00:00
Frank M. Kromann eeb4fd9b45 Adding missing files to project 2002-04-30 04:36:34 +00:00
Sebastian Bergmann eacad68c68 Fix ZTS build. 2002-04-30 04:27:52 +00:00
Wez Furlong 2d88266965 Use ftok for message queue key. 2002-04-30 00:58:52 +00:00
4618a517da ChangeLog update 2002-04-30 00:41:33 +00:00
Wez Furlong 501ed6ccb2 Make use of new flag so that we can buffer http headers when we know that
the stream is not intended to be used in require/include.
2002-04-30 00:30:00 +00:00
Wez Furlong 760573695c Implement user-space funtions to operate on stream contexts. 2002-04-30 00:28:24 +00:00
Wez Furlong 840ed90f2b Fix is_file test.
# Is there a good reason for having the actual test in an include file??
2002-04-30 00:26:49 +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
foobar 94f9b3bdb5 Never add libraries without checking that they exist and can be linked. 2002-04-29 18:08:20 +00:00
Harald Radi e72caee650 RETURN_NULL() is defined with braces while RETURN_TRUE
and RETURN_FALSE are defined without.
seems not very consistent ?
2002-04-29 17:20:15 +00:00
Stanislav Malyshev 11df2122df Add comments for the fix 2002-04-29 16:02:41 +00:00
Stanislav Malyshev 91a78e2974 Fix here too 2002-04-29 16:02:10 +00:00
Harald Radi 667a0841f3 functions returned FALSE in case of error and the oo api returned NULL.
make them both behave equal (return NULL, as FALSE can be a valid value).
2002-04-29 15:50:30 +00:00
Stanislav Malyshev aa10ac9a64 Yet another serialization fix - for incomplete class 2002-04-29 15:44:30 +00:00
foobar d066ed7c0e Make it possible to use recode 3.5 too. (happy now Wez? :) 2002-04-29 15:40:16 +00:00
foobar 43d46c2c41 Sync with PHP_4_2_0 branch. 2002-04-29 15:36:14 +00:00
Markus Fischer 8cf30c79ff - Fix WS and CS a bit 2002-04-29 15:06:48 +00:00
Markus Fischer c970490d28 - Store last errno in the module global 'last_error' implicitely
- Set the global 'last_error' explicitely for functions which can't return an
  error withing a single socket context (socket_create and socket_select)
- Modified socket_last_error() to return global modules last
  error if no socket resource is given
- Added a couple of more E_WARNING messages in case something
  goes foobar so the user isn't left alone in the dark.
2002-04-29 14:52:29 +00:00
Wez Furlong ab69b0c6ec Slightly alter the signature of msg_send and msg_receive so that error
codes and serialized "false" messages can be distinguished.
2002-04-29 12:52:34 +00:00
Yasuo Ohgaki 58896d5ef2 MFB 2002-04-29 09:25:56 +00:00
Stig Bakken 18936b9b61 * version will be 0.10 2002-04-29 06:41:42 +00:00
Stig Bakken dd3423434a * slight cleanup 2002-04-29 06:38:07 +00:00
Stig Bakken 7db1420fa6 * call the right parent constructor 2002-04-29 06:29:07 +00:00
Stig Bakken ac53945e9b * PEAR_Installer constructor now expects only the UI object 2002-04-29 06:24:37 +00:00
Stig Bakken 1ca41f7f49 * PEAR_Common::downloadHttp no longer wants a config object 2002-04-29 06:23:51 +00:00
Stig Bakken c5d6a0c524 * always set $this->config (use PEAR_Config::singleton)
* rename setFrontend to setFrontendObject
* add validPackageName method
* added downloadHttp callback types setup, connfailed and writefailed
* no more passing config objects around
2002-04-29 06:23:05 +00:00
Stig Bakken 0252c2bb39 * use the downloadHttp method w/callback 2002-04-29 06:20:42 +00:00
Rui Hirokawa 2f52cbbb7c shlib suffix was not defind and rint() was not found without -lm. 2002-04-29 02:55:55 +00:00
b028d4cf5a NEWS update 2002-04-29 00:43:40 +00:00
6ec7757764 ChangeLog update 2002-04-29 00:42:35 +00:00
Sascha Schumann 71124226d5 Touch generated file
# is it really so hard to remember this?
2002-04-28 21:24:52 +00:00
Sebastian Bergmann cd43b26095 Enable bundled build of ext/ctype and ext/mbstring on Win32. 2002-04-28 17:50:09 +00:00
Stanislav Malyshev a57381e3bd Fix couple of nasty serializer bugs:
a) When array unserializer encounters less data than it expects (like:
a:1:{}) it crashes. I don't understand exactly why it does, but the fact
is it does. So now it should catch "}" and bail out.
b) When array/object data are serialized, the count is written by hash
count. However, it can be that in-loop check fails and less data than
expected will then be written into the array. Which, due to a), would
crash on unserialize. So now it will write empty entries in place of
entries it cannot serialize (the other choice would be make two passes on
the data, which I don't like).
2002-04-28 16:56:33 +00:00
Thies C. Arntzen 245708b0db timestamp 2002-04-28 11:46:58 +00:00
Thies C. Arntzen 42158ef7c8 revert session_set_userdata - diffent patch will come shortly 2002-04-28 11:45:45 +00:00
Stig Bakken c6fe490093 * forgot script element in release contents 2002-04-28 07:58:41 +00:00
Stig Bakken 123a668fb5 * package.dtd: version 1.0b7
- added <provides> element
  - added <script> element
2002-04-28 07:52:00 +00:00
Stig Bakken eade67d6ab * implemented "list-remote-packages" command 2002-04-28 07:35:30 +00:00
Stig Bakken e08fb72a0c * implemented stub for XML_RPC fallback if xmlrpc-epi is not installed 2002-04-28 07:34:46 +00:00
foobar 80f9fdf3c7 @- Added optional 3rd parameter to mysql_select_db() which makes it return
@  the previously selected database name. (Jani)
2002-04-28 06:38:12 +00:00
Sebastian Bergmann 8463225b49 Revert. 2002-04-28 06:24:15 +00:00
foobar 305260ce4a kill a compile warning 2002-04-28 05:36:05 +00:00
foobar 2c8e8e0406 Fix build when openssl is enabled. 2002-04-28 04:53:40 +00:00
foobar c1c8a4fcfa touch file. Please commit first the .re file and afterwards the .c source. Otherwise, timestamps will be broken. 2002-04-28 04:14:47 +00:00
foobar 87a4bdca37 Missing dependancies.. 2002-04-28 03:27:43 +00:00
foobar 5e47866ec0 - Cleaned out the CVS commit conflicts.. 2002-04-28 01:49:42 +00:00
foobar 817750b088 ws fix 2002-04-28 01:37:54 +00:00
134e38ffd7 NEWS update 2002-04-28 00:35:32 +00:00
a7e28a7a07 ChangeLog update 2002-04-28 00:34:30 +00:00
Yasuo Ohgaki de4a0ba58e Add test case for file_exist/is_file 2002-04-28 00:05:43 +00:00
Sascha Schumann 30fd7de1fa s/len/xln/ was necessary here
Noticed by: Charles O Parks III
2002-04-27 23:37:17 +00:00
Sascha Schumann aab439f26f Use a single macro to set cl header 2002-04-27 18:41:38 +00:00
Thies C. Arntzen 7b59a131b6 @ - If possible set Content-Length header in zlib.output_compression mode. (thies) 2002-04-27 17:03:32 +00:00
Harald Radi da9dd9acc9 updated TODO list 2002-04-27 15:47:18 +00:00
Sebastian Bergmann 90bad130a9 MFZE1: If the size-operands of memset are constants, the compiler can turn them into fast inline code. So, instead of using ecalloc, we use emalloc + memset in macro form now. emalloc will not return NULL, so the chosen macro form is safe. This is not true for malloc(3). An inline function accomodates our needs here. Suggested by: http://www.mail-archive.com/dev%40httpd.apache.org/msg02492.html (Sascha) 2002-04-27 15:23:46 +00:00
Thies C. Arntzen 2dee392e5b part 2 of last commit 2002-04-27 14:08:07 +00:00
Thies C. Arntzen eb105693b8 @ - added session_set_userdata() which enables you to specify one variable
@   that will be kept in the browser in addition to the session-id. This
@   only works when using trans-sid sessions (no cookie). (thies)
2002-04-27 14:07:52 +00:00
Rasmus Lerdorf 22182fc78d # Since Jani seems to have us all on /ignore, I'm reverting 2002-04-27 13:38:55 +00:00
Harald Radi a380af2247 don't set CLSCTX_REMOTE_SERVER if NULL is passed as servername 2002-04-27 10:17:46 +00:00
foobar 6147e1e720 Fix bug: #16743 2002-04-27 01:02:52 +00:00
08b4079138 ChangeLog update 2002-04-27 00:35:20 +00:00
Yasuo Ohgaki 6cc8919dc4 Fixed bug #16861.
touch sets wrong atime or mtime when they are not specified.
touch silently failed when HAVE_UTIME is not defined.
(This needs more consideration. Which platform does not support it?)
# Derick, after HAVE_UTIME issue is resovled, this should be merged.
# or we can just merge 1st problem for now.
2002-04-26 23:46:51 +00:00
foobar 9e9ecbb84f - News entry about the change in php.ini-*
# This should have been done long time ago..
2002-04-26 23:28:24 +00:00
foobar f0de9845f8 Default setting for short_open_tag is better be Off. 2002-04-26 23:20:06 +00:00
Sascha Schumann 2b07dd4fe3 three less strlen invocations 2002-04-26 21:27:38 +00:00
Sascha Schumann 12ba44827a be a bit more verbose about what is wrong 2002-04-26 21:26:47 +00:00
Harald Radi 51241dba94 this patch should fix a bug where intermediate comvals were not
released before they were freed. this caused outproc com server
to belive that they still referenced even when the php process
already terminated.
2002-04-26 18:20:45 +00:00
Dan Kalowsky ce39ba7265 bug fix for bug #15758, a double free'ing of an ODBC connection 2002-04-26 14:56:34 +00:00
Sascha Schumann e2ad07fdcf Fix external builds 2002-04-26 10:23:16 +00:00
Sascha Schumann 5662171f0c reuse known values 2002-04-26 10:17:40 +00:00
Sascha Schumann 4efba9ef9d Improve use of module_globals macros 2002-04-26 10:13:45 +00:00
foobar 492efe963f - Fix for bug: #16791. (more reliable test) 2002-04-26 03:07:16 +00:00
77b99c3ce2 ChangeLog update 2002-04-26 00:43:34 +00:00
Wez Furlong f03115aae1 Add sysv IPC support (wrappers for msgsnd and friends). 2002-04-25 23:14:43 +00:00
jim winstead 79d113ba50 update generated file 2002-04-25 22:12:56 +00:00
jim winstead bc977dd195 Do not add redundant id attribute. It doesn't make the output any
more standards compliant.
2002-04-25 22:12:38 +00:00
Edin Kadribasic 54440c8bfd Some systems have mysql socket in /var/run/mysql 2002-04-25 21:07:36 +00:00
Edin Kadribasic b1c1a99b3d MFB 2002-04-25 17:20:14 +00:00
Rui Hirokawa 860e675884 fixed directory access problem when direcory name is encoded in japanese Shift_JIS encoding. 2002-04-25 14:43:40 +00:00
Stig Bakken 03a52cd97c * fix warning 2002-04-25 09:13:55 +00:00
Sascha Schumann 46527b3f5a Touch generated file to increase timestamp 2002-04-25 09:02:01 +00:00
Harald Radi 7e1a13131a already defined in zend_config.win32.h 2002-04-25 09:01:35 +00:00
Harald Radi f62e63dae7 unbreak the win32 build 2002-04-25 08:59:36 +00:00
Yasuo Ohgaki c5b4a507fe Added test for pg_fetch_*() functions 2002-04-25 07:52:01 +00:00
Yasuo Ohgaki b4c943ee7b Revert last 2 commits.
# Most PostgreSQL users should enable multibyte support ;)
2002-04-25 07:09:45 +00:00
Derick Rethans 8ffd089e02 - Fix for bug #16811 2002-04-25 06:43:11 +00:00
Derick Rethans 4ec1a03653 - Fix for bug #14353 2002-04-25 06:37:22 +00:00
Derick Rethans 4a834dfa44 - Fix for bug 16810 (XHTML compliance) 2002-04-25 06:30:09 +00:00
Yasuo Ohgaki 534ba498e3 Fix version in message 2002-04-25 02:40:58 +00:00
foobar c0be369f88 fine-tuning 2002-04-25 02:11:37 +00:00
foobar 9f096d2578 Only support the new libexpat. 2002-04-25 01:47:35 +00:00
Yasuo Ohgaki c65a20df4a pg_client_encoding/pg_set_client_encoding should be compiled always.
Recent libpq has PQclientEncoding/PQsetClientEncoding regarless of
multibyte support enabled or not.

Reported by c@cornelia-boenigk.de

# This should be merged, but need a little more testing.
2002-04-25 01:42:23 +00:00
da643f3fea ChangeLog update 2002-04-25 00:49:15 +00:00
Yasuo Ohgaki 48ea7057e4 Remove result_type from pg_fetch_object() proto.
It still accepts 3rd argument, but passing 3rd argument
does not make sense for pg_fetch_object().
2002-04-24 23:03:48 +00:00
Yasuo Ohgaki cf7f465ef9 It does not make any sense to have a PGSQL_BOTH as a default for pg_fetch_object()
Noticed by c@cornelia-boenigk.de
2002-04-24 22:57:21 +00:00
Dan Kalowsky 55e43151d5 clearing up some code to remove any possible confusion in variable counts 2002-04-24 22:07:29 +00:00
foobar e46f57b6fb - Fixed a typo..
# not related to the localhost.localdomain thing..
2002-04-24 18:00:39 +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
Harald Radi 8bf59c8fd0 MFZE1 saschas 'Avoid exceeding buffer limits' patch 2002-04-24 15:46:40 +00:00
Andrei Zmievski 77629de74e *** empty log message *** 2002-04-24 15:30:59 +00:00
foobar 0d7b1a4e94 - Do the ssl_onceonlyinit() as last. This is how c-client creates
the linkage.c (used by Pine).
2002-04-24 15:29:52 +00:00
foobar 0cc3ccbfa8 - Missing .libs line..
# whoever removed all the .libs lines from these files,
# please put them back.
2002-04-24 15:28:50 +00:00
Andrei Zmievski 5ff970ba7d Fix Bug #14795. 2002-04-24 15:23:43 +00:00
Andrei Zmievski 4fc01022e6 Fix unwanted type conversion in array_merge_recursive (Bug #14990). 2002-04-24 15:01:53 +00:00
foobar 712c85eddc One big mess is a bit less mess now. 2002-04-24 12:45:55 +00:00
Uwe Steinmann 1259f0c24a - Put news item about changes of domxml in 2002-04-24 08:04:36 +00:00
Derick Rethans df97b95b4d Merge fixes 2002-04-24 06:40:36 +00:00
foobar 0a1f795271 Fix ZTS build. 2002-04-24 05:49:57 +00:00
foobar b6c79ed5e7 Added the 4.2.1 entries here too. 2002-04-24 02:06:33 +00:00
foobar a49d98b499 fixed the comment.. 2002-04-24 01:51:12 +00:00
Aaron Bannert b2f9b6fb16 Apache does a full load, unload, load cycle for each DSO module.
This patch makes sure that any startup actions that are performed
for PHP don't happen until the second load (the second call to
the post_config hook), and it also prevents subsequent calls
to the initialization routines.

Suggested By:   Cliff Woolley

PR: 16475, 16754
2002-04-24 00:55:38 +00:00
Stig Bakken 3460eedfca * add "_lastmodified" timestamp to registry files (don't trust filemtime) 2002-04-24 00:48:06 +00:00
dc49f3cd0a NEWS update 2002-04-24 00:23:56 +00:00
0cb2b488f7 ChangeLog update 2002-04-24 00:23:03 +00:00
Stig Bakken 1ac4caa680 0.9.1 release notes ++ 2002-04-23 23:37:07 +00:00
Stig Bakken 31d02d2bb8 * make validator work again 2002-04-23 23:36:54 +00:00
foobar c3a6cbbc42 Fixed the extension name. 2002-04-23 23:30:20 +00:00
Stig Bakken da684c5a00 * roll out 1.2 release 2002-04-23 23:29:16 +00:00
foobar 4586a989ef Wrong variable used here.. 2002-04-23 23:17:41 +00:00
foobar 5aed99b456 ws fix 2002-04-23 22:45:51 +00:00
Markus Fischer a8b633bfa2 - Fix proto. 2002-04-23 22:22:17 +00:00
Markus Fischer be013212bc - Fix pcntl_waitpid() [Fixes #16766]. 2002-04-23 21:21:41 +00:00
Sascha Schumann 1d22766fb1 Add #ifdef.. around F_SETFD. 2002-04-23 19:58:31 +00:00
Derick Rethans e31793414d Fix TSRMLS_CC thingies. 2002-04-23 19:01:31 +00:00
Harald Radi 51e797f1e3 some type cleanup work 2002-04-23 18:06:54 +00:00
Uwe Steinmann fc851f342a - replace_child() will not add a child twice
- domxml_open_mem() drops old optional parameter to switch between reading
  from a string or a file.
- new optional parameter for domxml_open_mem() which set the mode how the
  document shall be parsed
2002-04-23 13:24:25 +00:00
Hartmut Holzgraefe 4852dd3569 apache_child_terminate() returns status as bool
proto fixes
2002-04-23 11:40:19 +00:00
Yasuo Ohgaki 417f299d0e Remove unneeded 'return'. 2002-04-23 08:10:45 +00:00
Yasuo Ohgaki e6780384ad Fix possible wide char prolem.
Fix empty output when no conversion is performed.
# Derick, this needs to be merged.
2002-04-23 08:07:19 +00:00
Stig Bakken 722cd4fa17 * use PEAR_Common::downloadHttp() 2002-04-23 07:01:45 +00:00
Stig Bakken e22ee6a085 * downloadHttp: pass the total number of bytes downloaded as parameter
to the 'done' callback
2002-04-23 06:49:10 +00:00
Stig Bakken 124c63b333 * moved these "class variables" to global variables and added static methods for getting
them: maintainer_roles, release_states, dependency_types, dependency_relations,
  file_roles, replacement_types
* added downloadHttp method with status callback support (can be used by installers
  to show download progress)
2002-04-23 06:28:44 +00:00
Uwe Steinmann 1e9000e315 - added new function DomDocument->ids (subject to change) 2002-04-23 06:26:46 +00:00
Uwe Steinmann d4c273c3a7 - get_element_by_id() doesn't use xpath anymore but searches in
xmlDoc->ids as provided by libxml.
- New function DomDocument->ids() returns a list of ids (subject to change)
- replace_node() doesn't make a copy of the new node if it has no parents
2002-04-23 06:05:38 +00:00
Sascha Schumann cab34e6b05 No need for an ifelse here (which was lacking a char anyway :-) 2002-04-23 05:06:51 +00:00
Yasuo Ohgaki e7e0eddadd Make pg_convert/pg_insert/pg_select/pg_update/pg_delete a bit more flexible.
pg_convert() may ignore, NOT NULL and/or DEFAULT.
pg_insert/pg_update/pg_select/pg_update may return query string.
2002-04-23 03:42:26 +00:00
foobar f54f199906 This was not supposed to be uncommented..yet. 2002-04-23 03:02:20 +00:00
foobar dace2eca03 Part 4 of apache sapi build fixes:
- Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset
  redefinition warning is gone now.
2002-04-23 03:01:30 +00:00
foobar eb18c5c38c Part 3 of static apache build fixes:
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
  o Fixes the fnmatch.h issue Wez complained about :)
2002-04-23 02:58:54 +00:00
foobar 50f91c18fb Part 2 of static apache build fixes:
- Added 2 variables to be used in libphp4.module
  o Apparently autoconf 2.53 screws abs_srcdir
- Made INCLUDES and EXTRA_INCLUDES available to be used with AC_OUTPUT()
  o Not related to the static apache build issues
2002-04-23 02:51:17 +00:00
foobar 3679c6e054 Part 1 of commits to fix some issues with static apache (1.3.x) compile:
- Made the OPENSSL_INCDIR available to be added in the PHP_CFLAGS
  in libphp4.module
- Make it possible to set SAPI specific include dirs
2002-04-23 02:47:34 +00:00
foobar 675ff2d811 Missing date for 4.2.0 2002-04-23 01:44:46 +00:00
d16ea58e8b ChangeLog update 2002-04-23 00:28:29 +00:00
foobar ae2e36a4e5 Changed the error for 'no upload' to E_NOTICE so that it doesn't
pollute the logs too much.

@- Fixed possible crash bug in HTTP uploads. (Patch: Lucas Schroeder)
2002-04-23 00:14:08 +00:00
Rui Hirokawa 36e51815ad fixed access problem when japanese Shift_JIS character is used as directory name. Some characters in Shift_JIS are including 0x5c (slash) as second byte. 2002-04-22 22:14:39 +00:00
Sascha Schumann 303a784822 remove unnecessary casts
# if you mind the bogus warnings, you can either switch the compiler
# or decrease the warning level
2002-04-22 20:42:01 +00:00
Sascha Schumann 5a83ad6dc1 Set the close-on-exec flag for fds. Child processes should not inherit
the fd.

Also rip out the broken O_EXCL use.  Our file names are not unique and
this left a small window open where creating a session file would fail
(a, b notice that the file does not exist; a creates the file successfully;
 b tries to create, but fails due to O_EXCL).
2002-04-22 20:39:24 +00:00
Jim Jagielski a6117a874e Typo in error string 2002-04-22 20:00:41 +00:00
Harald Radi 894aac6e19 set up a proxy object when requesting a reference to a variable 2002-04-22 19:40:01 +00:00
Harald Radi b29604fefc fixes a warning when compiling under win32 2002-04-22 18:02:01 +00:00
Marko Karppinen 42555b189e Refine the OS X support a bit 2002-04-22 15:37:54 +00:00
Marko Karppinen 2cd85ac084 Merged the Mac OS X compile changes from the Apache 1.3 SAPI.
--with-apxs2 should now work on Mac OS X / Darwin.
# Not tested, though. So shoot me! :)
2002-04-22 15:25:17 +00:00
Marko Karppinen e7ccaf4fb9 Prettify the NEWS entries
# So that Jani doesn't have to do it every time!
2002-04-22 14:55:51 +00:00
Marko Karppinen 2580f11aa8 Let's pretend this is up-to-date now 2002-04-22 14:45:13 +00:00
Harald Radi 94ba23998f changes related to the latest commit of the zend engine 2002-04-22 14:25:46 +00:00
Harald Radi 6ac6cb1040 added get_class_entry callback handler to the
object handlers structure
2002-04-22 14:22:27 +00:00
Edin Kadribasic 6c491a5654 Reverting my previous patch. 2002-04-22 12:00:53 +00:00
Sebastian Bergmann 79d71a17a5 MFZE1: Change default value of inline-opt to yes (Sascha). 2002-04-22 11:06:22 +00:00
Harald Radi 2afbbd2e4f fixed linkage warning under win32 2002-04-22 09:33:25 +00:00
Martin Jansen eb3c6e7a18 * Due to the recent changes in the installer stuff, the webinstaller
is not supported at the moment.
2002-04-22 09:11:06 +00:00
Sascha Schumann ebd957f69e hash keys lengths include the NUL-byte, so we need to copy one byte less.
also add missing commas in the INSERT clause.

Noticed by: Yasuo Ohgaki
2002-04-22 08:18:19 +00:00
865c2b7ca4 ChangeLog update 2002-04-22 00:21:33 +00:00
foobar 983355dfde missing .cvsignore 2002-04-21 22:28:37 +00:00
Rui Hirokawa 222a2f4fef fixed problem when multibyte character is included in file path on Windows. If _MBCS is defined, _tcstok is defined as _mbstrtok which is multibyte enabled strtok. If _MBCS is not defined, _tcstok is defined as strtok. 2002-04-21 22:20:14 +00:00
Rui Hirokawa aa9cf268db small performance improvement when pass is selected as input encoding. 2002-04-21 22:06:55 +00:00
Edin Kadribasic 8509772d93 Added ..\..\..\php_build\lib\apache2 to libpath and
..\..\..\php_build\include\apache2 to includepath
2002-04-21 20:36:08 +00:00
Wez Furlong 6d1dc8141c Apply that patch I wrote ages ago that fixes some problems with true-color
vs palette based handling.
Also implements the gdImageStringFTEx function.
2002-04-21 13:48:22 +00:00
Stig Bakken 88024105c9 * more uniform "level 2 debug messages"
* don't add dirname(file) to install path if install-as attribute is set
2002-04-21 11:46:41 +00:00
Sascha Schumann d1a1f17628 refactoring in pgsql_do_connect and some "leaner" code in pgsql_add_quotes 2002-04-21 11:29:17 +00:00
Sascha Schumann c2c23ff6df Avoid allocating resources, if we know that the input array is empty.
Also pass tsrmls to do_exec.
2002-04-21 10:44:31 +00:00
Sascha Schumann bf87992040 speling fix and s/FAILURE/HASH_KEY_NON_EXISTANT/ 2002-04-21 10:37:40 +00:00
Sascha Schumann c6016fcfd2 The default has been changed to assume failure, because there were 5-10
cases of failure and one success.
2002-04-21 10:28:01 +00:00
Sascha Schumann db24a14b9b Add PGSQL_RETURN_OID which encapsulates the LONG_MAX check etc.
Add a few missing smart_str_0's.

Remove a "(" in a probably less-tested #ifdef.. branch
2002-04-21 10:22:31 +00:00
Sascha Schumann 9a7418906c Also support --disable-shared installations of pgsql 2002-04-21 10:18:34 +00:00
Stig Bakken 8a41f93fcc * set version to 0.9.1-dev 2002-04-21 10:17:13 +00:00
Stig Bakken 40878cbe0e * PHP_PREFIX constant is not defined, use bin_dir pear config instead 2002-04-21 10:16:32 +00:00
Sascha Schumann 7e597b260a My patch as posted to php-dev + warnings/errors fixed as seen in
Yasuo's reply.
2002-04-21 09:46:29 +00:00
Martin Jansen dc8c2c9a6c * Remove package directory if empty during uninstall process
* Don't baseinstalldir for documentation.
2002-04-21 06:17:53 +00:00
foobar 65078f3b50 Tiny typo.. 2002-04-21 02:50:38 +00:00
Tomas V.V.Cox 13f7ec4374 Bail on no HTTP.php present in the system
Let "pear download" act ala wget
2002-04-21 01:34:49 +00:00
Tomas V.V.Cox 929e8f81e3 typo 2002-04-21 01:32:03 +00:00
Sascha Schumann d30fc27e5a simplify and improve speed of smart_str_print_long.
also add a variant for unsigned numbers.
2002-04-21 01:17:49 +00:00
Sterling Hughes 5db5498f90 expletives deleted. 2002-04-21 00:41:38 +00:00
Sterling Hughes dc3b3fa302 some more fixes towards making it work again 2002-04-21 00:27:05 +00:00
382bdcf427 NEWS update 2002-04-21 00:18:33 +00:00
804aa39035 ChangeLog update 2002-04-21 00:18:00 +00:00
Zeev Suraski 579b9bff3d MFZE1 2002-04-20 20:14:14 +00:00
Sascha Schumann 5e25c15d6c allocate space for NUL 2002-04-20 18:58:20 +00:00
Derick Rethans 6075a65319 - initialize globals properly 2002-04-20 18:33:54 +00:00
jim winstead 36751953d4 include the checks for various support libraries to --with-gd=php section. the
libgd stuff needs some additional checks to handle the presence/absence of
things like libpng, but this helps when most things are included.
2002-04-20 18:02:14 +00:00
jim winstead 95e9eb35d8 s/.o/.c/ 2002-04-20 17:24:37 +00:00
Sterling Hughes a8504dc592 realloc buffer down 2002-04-20 16:08:30 +00:00
Sascha Schumann 20c0fed127 If I don't want mbstring, I also don't want this transparent encoding
thingee which caused an undefined reference in main.o.
2002-04-20 15:17:57 +00:00
Yasuo Ohgaki 3087b96ece Make pg_lo_import()/pg_lo_unlink()/pg_lo_open()/pg_lo_export() work with oid larger than 2^31.
@Added large OID value (2^31 to 2^32) support for pg_lo_import()/pg_lo_unlink()/pg_lo_open()/pg_lo_export(). (Yasuo)
2002-04-20 14:06:47 +00:00
Derick Rethans 63c3c0874a - Add missing .cvsignore 2002-04-20 11:11:49 +00:00
Sander Roobol b10e119023 Another .cvsignore update 2002-04-20 09:32:52 +00:00
Sander Roobol 230ded56ed Removed makefiles from most .cvsignores and some minor cleanups. 2002-04-20 09:32:42 +00:00
Sander Roobol d94a8467f0 Added missing .cvsignore 2002-04-20 08:25:00 +00:00
Yasuo Ohgaki 29e3175f97 Added comment to fix large OID value handling later.
Fixed wrong conversion specifiers.
2002-04-20 04:17:17 +00:00
Yasuo Ohgaki 3ee7591ae9 Added missing 'd'. 2002-04-20 03:50:21 +00:00
Yasuo Ohgaki d845ba2077 Some cleanup.
More OID range related fixes.
# Need a little more work for OID
2002-04-20 03:37:01 +00:00
Yasuo Ohgaki 07125ea9f4 Fixed OID overflow. If value is larger than MAX_LONG,
pg_last_oid() returns string to keep correct value.
2002-04-20 03:03:42 +00:00
Yasuo Ohgaki 04fb5ef2e3 Added API version for C programs 2002-04-20 02:38:30 +00:00
Yasuo Ohgaki c53c212da6 Remove warnings.
Fixed OID overflow bug.
Fixed type convertion bug.
# Thank you Edin.
2002-04-20 02:31:48 +00:00
foobar b3805dd364 We call them "extension"..and again, missing period. :-p 2002-04-20 02:19:43 +00:00
15f1841ed5 NEWS update 2002-04-20 00:19:55 +00:00
62efcae45e ChangeLog update 2002-04-20 00:19:10 +00:00
Sterling Hughes c53003575a throw a warning if encoding support not available... 2002-04-19 23:46:09 +00:00
Sterling Hughes 832ec57fda update todo a bit 2002-04-19 22:34:45 +00:00
Sterling Hughes 8912735d86 make it work with dom processing, this allows DOM tree caching to avoid
re-parsing the same data.  Currently very beta -- DO NOT USE.  Will be cleaning
this up over the next few days...  Need this in here for version history, and
to show other people
2002-04-19 22:17:23 +00:00
Adam Dickmeiss 4bf2f16771 Indentation;) 2002-04-19 20:15:40 +00:00
Adam Dickmeiss 6ad3b2bf43 fix warning 2002-04-19 20:03:47 +00:00
Andrei Zmievski 4acbbcf5a9 Revert bogus patch. 2002-04-19 17:23:22 +00:00
Sebastian Bergmann bf5bb84277 MFZE1: make sure the resource-list is always consistent during shutdown (Thies). 2002-04-19 16:53:36 +00:00
Sebastian Bergmann 2697ce689d MFZE1: Fix imbalance bug (Zeev). 2002-04-19 16:43:27 +00:00
Derick Rethans 18a3f085aa - Fix warnings in VC 2002-04-19 14:57:46 +00:00
Stig Bakken 8fcdb67068 * add http_proxy config setting 2002-04-19 14:01:51 +00:00
Stig Bakken c8418830f9 * make "pear install package.xml" possible, so you can install a package
without building a tarball first
2002-04-19 14:01:10 +00:00
Stig Bakken 021ed8a10b * reintroduce (un)install -r option for Registeration only 2002-04-19 14:00:14 +00:00
Stig Bakken 0ca308d152 * fix phpdoc 2002-04-19 13:58:25 +00:00
Yasuo Ohgaki e64696d729 Fixed pg_insert/update/select/delete overflow. 2002-04-19 13:09:09 +00:00
Yasuo Ohgaki 825e011805 Update tests 2002-04-19 12:24:58 +00:00
Yasuo Ohgaki 7a8ad06121 Added "NOT NULL" check and do not add converted variable when field is NULL and HAS DEFAULT.
(php_pgsql_convert)
2002-04-19 12:24:14 +00:00
Yasuo Ohgaki 8d8ca2602b Changed "default" -> "has default" (metadata)
Fixed comment. Do not use magic number.
2002-04-19 12:19:29 +00:00
Wez Furlong 928bae9cf8 Make scheme part decoding rfc2396 compliant.
Change zlib:// and bzip2:// to compress.zlib:// and compress.bzip2://
Tidy up old socket/network code/comments.
2002-04-19 10:06:41 +00:00
Yasuo Ohgaki fe6990cc6b Remove compiler warnings 2002-04-19 07:56:41 +00:00
Yasuo Ohgaki c1ae59c588 Fixed file include error 2002-04-19 07:55:24 +00:00
Yasuo Ohgaki ec11233183 Remove warning. 2002-04-19 07:54:52 +00:00
Yasuo Ohgaki 2efc8847cd Fixed test title (strlen -> mb_strlen) 2002-04-19 07:51:00 +00:00
Yasuo Ohgaki f463be8408 Leave "" (null string) when converting. 2002-04-19 07:47:53 +00:00
Yasuo Ohgaki 3b75b606d8 Remove warnings 2002-04-19 07:33:51 +00:00
Yasuo Ohgaki e59e3884b6 Added mbstring.func_overload directive 2002-04-19 07:13:55 +00:00
Yasuo Ohgaki 26bf419778 Fixed messages 2002-04-19 07:08:26 +00:00
Yasuo Ohgaki fe5c67d285 Remove gargabe 2002-04-19 06:33:55 +00:00
Yasuo Ohgaki 6c8bcadf76 Enable mbstring by default.
@ mbstring module is enabled by default (Yasuo)
2002-04-19 06:32:26 +00:00
Yasuo Ohgaki fd89d2d24a Added description to mbstring ini entries 2002-04-19 06:30:14 +00:00
Yasuo Ohgaki e17161443a Avoid defining/using S_ISDIR macro. 2002-04-19 05:48:22 +00:00
fedfdd2c11 ChangeLog update 2002-04-19 00:22:58 +00:00
Derick Rethans 68ca74c371 - Gaurd for problems in fault servers (fixes problem with Sambar 5.2) 2002-04-18 22:51:23 +00:00
Aaron Bannert 5ab179e830 Document the new PHPINIDir directive in the apache2filter/README. 2002-04-18 22:47:13 +00:00
Aaron Bannert 3aa8a9b62b This patch implements a new Apache2 directive called PHPINIDir that
allows the specification of the php.ini directory from within the Apache
configuration. If left unset, the default is to defer to the hard-coded
php paths. When set, the supplied path is made relative to Apache's
internal ServerRoot setting.

Example:
PHPINIDir "conf"
# PHP will now look in the ServerRoot/conf directory for the php.ini file
2002-04-18 22:10:57 +00:00
Martin Jansen ab54cc1e1b * Add API documentation. 2002-04-18 18:04:06 +00:00
Sebastian Bergmann a312b1f2ab Allow for PCRE to be disabled. 2002-04-18 17:56:53 +00:00
Sebastian Bergmann c57ab20ac8 Make use of HAVE_MYSQL. Reviewed by: Sterling. 2002-04-18 16:48:03 +00:00
Sebastian Bergmann ecf95deb6a Conditionally include mbstring.h. 2002-04-18 16:39:30 +00:00
Sebastian Bergmann 05a2de0d6a Add HAVE_CALENDAR, HAVE_COM, HAVE_SESSION and HAVE_TOKENIZER to enable/disable these extensions, respectively. It is now possible to build PHP on Win32 with just ext/standard and ext/pcre. The latter is needed by the former, because at least the aggregation functions use PCRE. 2002-04-18 16:34:13 +00:00
Aaron Bannert d11ee7c1ea Fix an intermittent SEGV when an error bubbled up from PHP before our
server context was set. Now if that happens we simply don't log against
any particular server config (vhost).

Obtained from bug report by:  Balazs Nagy <js@iksz.hu>
2002-04-18 16:34:06 +00:00
Sander Roobol fd167a7d42 Removed redefinition of MIN() 2002-04-18 14:05:28 +00:00
Sander Roobol 151bc2a082 Removing unused variable 2002-04-18 14:04:10 +00:00
Derick Rethans c0c9279c0a - MFH: Make DBA compile as a shared module again 2002-04-18 12:30:18 +00:00
Sebastian Bergmann 1d275db13b Some cleanup for the Win32 build configuration. 2002-04-18 11:58:08 +00:00
Harald Radi f246e23799 whitespace fixes 2002-04-18 10:05:47 +00:00
Alan Brown ad9f90a223 Missing break; causes fallthrough which actually causes heap corruption in the debugging version despite being just plain wrong. Also placed a default "Unavailable" message when the object does not populate the EXCEPINFO structure. Also removed a minor memory leak. 2002-04-18 01:56:29 +00:00
Alan Brown bbb133f292 When V_BSTR() is NULL, we pass a NULL pointer into php_OLECHAR_to_char() which reports an exception. Better to map a NULL string pointer to ZVAL_NULL. 2002-04-18 01:52:07 +00:00
57031f2ba0 ChangeLog update 2002-04-18 00:21:57 +00:00
Sebastian Bergmann 548421ff9a Whitespace fixes. 2002-04-17 18:14:03 +00:00
Sebastian Bergmann 81599ef561 Only include php_bcmath.h when WITH_BCMATH=true. 2002-04-17 18:11:53 +00:00
Sebastian Bergmann 958c68a17c Give HAVE_MYSQL meaning on Win32. 2002-04-17 18:10:35 +00:00
Sebastian Bergmann 08a4924344 Give HAVE_UODBC meaning on Win32. 2002-04-17 17:57:40 +00:00
Sebastian Bergmann 4a9c2f43f4 Give HAVE_LIBEXPAT and HAVE_WDDX meaning on Win32. 2002-04-17 17:51:30 +00:00
Sebastian Bergmann d2809b9fca Give HAVE_FTP meaning on Win32. 2002-04-17 17:38:03 +00:00
Sebastian Bergmann a16213f5fd Remove bogus includes. 2002-04-17 17:33:14 +00:00
Sebastian Bergmann c2dd85ce15 Patch by Marcus Börger. 2002-04-17 17:25:18 +00:00
Stig Bakken 948106fd20 * doooh! 2002-04-17 08:22:56 +00:00
Uwe Steinmann 4a2c9980b8 - fixed memory leak 2002-04-17 07:33:39 +00:00
Sebastian Bergmann 90f32a7d9c SPACEs->TAB. 2002-04-17 05:21:04 +00:00
Sebastian Bergmann 208c52fda6 Beautify. 2002-04-17 05:19:10 +00:00
Sebastian Bergmann 6d42121bf3 Forgot adding phpext_tokenizer_ptr. 2002-04-17 05:16:42 +00:00
Sebastian Bergmann 2fc2f74ad1 Enable ext/tokenizer by default on Win32, too. Since there is no HAVE_TOKENIZER flag, it cannot be turned off in config.w32.h. 2002-04-17 04:44:02 +00:00
d37c22ee3f ChangeLog update 2002-04-17 00:25:55 +00:00
Wez Furlong b10b24d50c Always initialize wrappers, regardless of PG(allow_url_fopen).
Add is_url field to wrapper structure; the stream wrapper openers
will disallow opening is is_url && !PG(allow_url_fopen).
Add infrastructure for stat($url) and opendir($url).
Tidy up/centralize code that locates and instantiates wrappers for the
various operations.
Implement opendir for plain files.
Make the PHP opendir and dir functions use the streams implementations.
Add modelines for syntax highlighting the pear scripts in vim
2002-04-16 22:14:27 +00:00
Stig Bakken fe2badf64e * added DB::isConnection
* phpdoc fixes
2002-04-16 21:50:48 +00:00
Marcus Boerger 7bb4b5bd76 fix cli/cgi -c <path>|<file>
#hope this fixes it really (works for me)
2002-04-16 19:08:02 +00:00
Aaron Bannert 2e3ce44c80 It makes more sense to do the null-pointer check *before* trying to use it.
(Also fix a typo that Cliff pointed out: "safe" --> "save".)

Obtained from:  Ryan Morgan <rmorgan@covalent.net>
2002-04-16 17:41:28 +00:00
Sterling Hughes 651c00718a move xslt_error and xslt_errno down to functions, in order to
make logical room for the xslt_dom_* functions

# (xslt_dom_* will be a basic api, allowing no dom manipulation,
#  however, one of these days I'll write a message/extension that
#  handles xslt/dom/sax in a coherent manner -- just you watch :)
2002-04-16 15:54:59 +00:00
Wez Furlong 1f4d4873dc remove old code 2002-04-16 14:47:20 +00:00
Sander Roobol c18338b84e Added missing function to function_entry 2002-04-16 14:19:09 +00:00
Stig Bakken 5d7b69f43e * started working on analyzeSourceCode and detectDependencies methods 2002-04-16 13:27:42 +00:00
foobar 01ae2f026e removed ws pollution 2002-04-16 12:58:23 +00:00
foobar 6394a85af8 Added 2 new tokens: T_CLASS_C and T_FUNC_C 2002-04-16 12:53:07 +00:00
Derick Rethans 561552cb4d - MFB: Remove version number 2002-04-16 10:14:08 +00:00
Sterling Hughes e937ad5adf update these docs, phpdoc will lag a bit :) 2002-04-16 06:41:05 +00:00
Sterling Hughes 2b5a95b54b Prefix current functions with "sax" in order to make way for dom interface
backwards compatibility is maintained via function aliases
xslt_sax_set_sax_handlers is a bit wierd, i guess...
2002-04-16 06:37:19 +00:00
Sterling Hughes 59f3ba1490 clean up the error code a tidbit 2002-04-16 06:04:17 +00:00
Stig Bakken e07f7cce08 * build tokenizer by default 2002-04-16 05:37:51 +00:00
Stig Bakken e32362f792 * chdir back to original dir in PEAR_Packager::package
* only display "cvstag" hint if CVS/Root exists
2002-04-16 05:01:41 +00:00
7acfa47fb5 ChangeLog update 2002-04-16 01:33:15 +00:00
Tomas V.V.Cox b339986c12 Added standar header 2002-04-16 00:44:03 +00:00
Tomas V.V.Cox 7325f1a4f0 Added standar header 2002-04-16 00:38:21 +00:00
Tomas V.V.Cox 8a365fd8a2 Vim tags added plus some other minor text about license and author 2002-04-16 00:31:16 +00:00
Tomas V.V.Cox 299849fbf2 Be more clear when no packages are installed 2002-04-16 00:23:32 +00:00
Tomas V.V.Cox 26e59d106c Give the right error when wrong params given to package-info and
fix/add help some help messages
2002-04-16 00:22:55 +00:00
Frank M. Kromann 1c111b5d3f Fixing Win32 compilation of mbstring 2002-04-15 23:03:48 +00:00
Frank M. Kromann 45881d2b40 Fixing Win32 compilation of exit 2002-04-15 22:23:20 +00:00
Frank M. Kromann 643fb6dcdf Adding PHPAPI needed for exif on Win32 2002-04-15 22:22:53 +00:00
Mark L. Woodward c000d491d7 Chages for beta3 2002-04-15 22:00:56 +00:00
Wez Furlong ca6b88ef46 should not be there 2002-04-15 20:12:29 +00:00
Wez Furlong 50cf12ce4c Some minor tweaks and debugging for sockets. 2002-04-15 20:11:12 +00:00
Uwe Steinmann de2ef69032 - DomNode->replace_node() now returns the node that was replace and
not the new node
- fixes Bug #15949
2002-04-15 15:39:10 +00:00
Uwe Steinmann c7e391637c - added DomNode->replace_child() 2002-04-15 14:45:38 +00:00
08e3ee7e90 ChangeLog update 2002-04-15 00:42:10 +00:00
Marcus Boerger ef5c0f7cc6 support for WinXP tags (thanks to Rui Carmo) 2002-04-14 20:47:21 +00:00
Thies C. Arntzen 136240ae46 fix crash bug introduced by last commit 2002-04-14 18:27:27 +00:00
Markus Fischer f95fbc4e60 - Do not try to draw a table if there are not elements.
# If no packages are installed, until now the output was:
#
# INSTALLED PACKAGES:
# ===================
# +
# +
#
# Now it is:
#
# INSTALLED PACKAGES:
# ===================
#
# Which is nicer IMHO. It think keeping the caption is ok.
2002-04-14 13:34:52 +00:00
foobar ce931e7413 Fixed some entries.. 2002-04-14 12:58:28 +00:00
foobar b21931e6c3 ws fixes 2002-04-14 12:38:33 +00:00
Derick Rethans 069d83c68a - Fix null-termination problem 2002-04-14 08:49:57 +00:00
Rui Hirokawa d5158c20a4 fixed error output handler when 'pass' is choosed as output encoding. 2002-04-14 08:18:55 +00:00
foobar 7c2811e1ab Make it possible to actually disable the CLI.. 2002-04-14 03:57:59 +00:00
Frank M. Kromann cd0b3ea491 /usr/lib is the default install dir on Mandrake 2002-04-14 02:28:09 +00:00
foobar 72c40cdf42 - Use the correct javac/jar binaries. 2002-04-14 00:40:36 +00:00
1a0ac41144 NEWS update 2002-04-14 00:23:02 +00:00
435857115d ChangeLog update 2002-04-14 00:21:50 +00:00
Thies C. Arntzen 12541a481e ocibind: avoid warning in debug mode if an outbound variable is NULL 2002-04-13 18:58:18 +00:00
Yasuo Ohgaki 3381fe4394 Fix cli/cgi -c option
# I must be sleeping
2002-04-13 14:12:17 +00:00
Thies C. Arntzen 33a493cf82 @- Mixing OCIPlogon and OCINLogon no longer leak Oracle-Sessions. (thies) 2002-04-13 12:10:03 +00:00
Christian Stocker 67292ee205 @- old $node->append_child() is now $node->append_sibling(), since
@  new append_child() now behaves like excepted (= W3C standard) (chregu, uwe)
2002-04-13 10:23:46 +00:00
Sascha Schumann 83719f5cd8 s/==/=/ 2002-04-13 09:26:29 +00:00
Markus Fischer 509ef0237f - Also raise a different error message if we don't specify any package at all.
# We might consider giving the 'pear help uninstall' output to the user?
2002-04-13 06:00:36 +00:00
foobar 0fa1516483 - Prevent users from trying to make a static build with Apache2 using
--with-apache

# I have working --with-apache2 stuff also..need to test it a bit more
# before committing it..
2002-04-13 05:58:29 +00:00
Markus Fischer e060e90f0c - Return a different error message if no package file was given at all. 2002-04-13 05:52:54 +00:00
Rasmus Lerdorf be2078bb73 oops 2002-04-13 05:43:14 +00:00
Markus Fischer e96a657f8d - Properly format error message.
# Shouldn't this 'throw' an PEAR Error object ?
2002-04-13 05:33:35 +00:00
Markus Fischer c7a1d96f8a - Fix a possible memory leak in xml_set_handler().
I stumbled over this while trying out 'pear package' which, while doing
  xml parsing, re-assigns the variaous callback handlers depending
  on the version during xml processing.

  If this check causes problems, let me know.
2002-04-13 05:06:33 +00:00
Rasmus Lerdorf 7a8cade379 Initial commit of the built-in libgd based on GD-2.0.1
This initial checkin has no changes to any of the libgd code so it can
be used as a basis for diffs.  It also will not build currently because
of this.  The PHP gd checks need to be incorporated along with a bit of
other config magic.  It also shouldn't break the build and will only
take effect if you use --with-gd=php right now.
2002-04-13 02:03:09 +00:00
foobar c46199f5b9 Do NOT use c++ comments in c code!!!!! 2002-04-13 00:31:55 +00:00
cff79286b8 NEWS update 2002-04-13 00:27:54 +00:00
e3c0fc38b9 ChangeLog update 2002-04-13 00:26:23 +00:00
Stig Bakken d1814a3c12 * cvstag command: tag slide option is -f, not -F 2002-04-13 00:23:19 +00:00
Stig Bakken 8c0edb86b0 * missing file role message could be mistaken for missing maintainer role 2002-04-13 00:20:40 +00:00
Stig Bakken 5d09a5e199 * add cookie authentication to PEAR_Remote (temporarily in addition to http auth) 2002-04-13 00:13:37 +00:00
foobar f81166f34e - Added checks to prevent building the DSO with wrong configure option. 2002-04-12 22:59:07 +00:00
Aaron Bannert bf8bb929ac Fix a typo and a build error detected by the lovely HPUX11 ANSI C compiler. 2002-04-12 22:25:29 +00:00
foobar 8581de0fe2 Fix the build.
# Marcus, do you TEST build at all before you commit?!
2002-04-12 22:02:28 +00:00
foobar 067ca4e813 Do NOT use C++ comments in C code. 2002-04-12 21:19:59 +00:00
jim winstead 84b37c9c03 remove this, since it doesn't describe the current process, and is
under a silly license.
2002-04-12 20:20:20 +00:00
Wez Furlong 4df5076d2f fix build with ZE2 2002-04-12 19:26:08 +00:00
Wez Furlong e2f00a130f fix segfault 2002-04-12 18:17:19 +00:00
Sascha Schumann 22815419f8 Gone they are.. files related to the old build-system 2002-04-12 17:28:41 +00:00
Jan Lehnardt 9b09fba139 - MFB (4_2_0) 2002-04-12 16:54:01 +00:00
Marcus Boerger 50d957cd7a Ini settings for internal encoding and decoding of Unicode and JIS formatted user comments.
@- Ini settings for encoding/decoding Unicode/JIS user comments (Marcus)
2002-04-12 16:35:56 +00:00
Frank M. Kromann 7ff43f040f Removing a unused local variable.
Setting the size before returning the value in readgzfile
2002-04-12 16:25:31 +00:00
Marcus Boerger 0f0a5dddf3 -new function php_mb_check_encoding_list
-mark module globals as const (thread safety)
2002-04-12 16:17:16 +00:00
Sander Roobol fa8e2db095 This test should be skipped if(!cgi) 2002-04-12 15:25:54 +00:00
Marcus Boerger df82b2ec75 -fix mb_detect_order
-php_mbstring_parse_encoding_list/array return 0 on any illegal input
2002-04-12 14:24:54 +00:00
Uwe Steinmann ce00085cdd - added method DomNode->remove_child() 2002-04-12 13:23:07 +00:00
Uwe Steinmann 53de1218fd - fixed stupid compile error 2002-04-12 11:47:48 +00:00
Uwe Steinmann 9b0564beb5 - insert_before(): copy node before doing the insert
- append_child(): actually do an append child and not and add sibling
- what is called xmlDtd in libxml is actually the class DocumentType
  in DOM. The domxml extension used a class DomDtd which is not defined
	in the DOM standard. Instead of using DomDtd DomDocumentType is now
	used. DomDtd has been renamed to Dtd but has not meaning anymore.
- added more functions
2002-04-12 11:32:23 +00:00
Sebastian Bergmann 3dfc150ff7 Sync with php4dllts. 2002-04-12 05:35:50 +00:00
Yasuo Ohgaki 734899e615 Enable CGI binary for testing. CGI binary should be used when it's
available, since some tests cannot be performed by CLI. (And
many of them are just failing now)
Fixed SAPI and VERSION output.
2002-04-12 01:34:06 +00:00
Yasuo Ohgaki 22919a4d36 Be nice to php.ini-recommended users.
php.ini-recommended uses output buffer resulting delayed output during
"make test". User php.ini file is used anyway, since run-tests.php
invoke php for each test from there.
2002-04-12 01:13:01 +00:00
Rasmus Lerdorf eb43795ccb This exif test was failing because the \0's in the expected output had
disappeared.  It may be CVS doing this.  I have put the nulls back, but we
may have to mark this as a binary file in th cvswrappers, or rewrite the
test to not output nulls.
2002-04-12 01:07:46 +00:00
Yasuo Ohgaki 0c9182ad71 Update Sablotron version supported. 2002-04-12 00:44:59 +00:00
feea1c56eb NEWS update 2002-04-12 00:26:32 +00:00
58c5f68368 ChangeLog update 2002-04-12 00:25:06 +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
Marcus Boerger fffb1a5d21 interpret empty to_encoding as encoding not set what results in current_internal_encoding 2002-04-11 22:52:43 +00:00
foobar 995e6f6af0 Fixed (again) the news entry..NEWS file is not a manual. 2002-04-11 22:42:10 +00:00
Rui Hirokawa adf58908e4 fixed a bug which causes crash when charset is not set. 2002-04-11 22:27:00 +00:00
Aaron Bannert 22fb507325 Fix a problem where php-generated data was pushed down the entire output
filter chain instead of just down the rest of the chain. This fix will
speed up some unnecessary overhead introduced in the last patch.

Suggested by:  Cliff Woolley <jwoolley@apache.org>
2002-04-11 20:34:56 +00:00
Harald Radi 6f22159aa2 fixed type 2002-04-11 20:32:03 +00:00
Aaron Bannert 27a5b380cf PHP filters and Apache 2 aren't quite a perfect match yet, so we have
to do some trickery with the server_context to make sure it is always
valid within the current thread.

This patch makes sure the server_context is created in apache's
post_read_request hook phase, and then registeres a cleanup that
will NULL out the server context when the request goes out of scope.
Then, inside the output filters, if the server_context is null we
throw an error. Finally, instead of saving the output filter in
the server_context, now we store the entire request_rec pointer
in there.

POST bodies appear to be working now, although they are very inefficient.
The input filter is still just realloc()ing for whatever data comes
down the input pipe, and then sending this to PHP. This means that
we are doing some really nasty memory management on big POST bodies.
For now this it allows for unlimited input bodies, which means that
a big POST could potentially DoS a box by making it run out of memory.
We might want to put a limit on here just in case, at least until
we figure out how to consume input data more efficiently into php.
2002-04-11 19:25:08 +00:00
Joseph Tate 07546ee788 Fixing project files so that they load 2002-04-11 17:52:26 +00:00
Aaron Bannert caf7f3d4d2 Don't depend on the context provided by the filter (f->ctx) anymore. In
Apache 2 the input and output filter contexts are kept unique. We now
only depend on SG(server_context) for each request, and assume that
the same thread will process the entire request. At some point it
would be wise to separate the input and output contexts.
2002-04-11 17:34:17 +00:00
Aaron Bannert d19fd6a0ad Return the number of bytes consumed, not the number of bytes left.
Suggested by:  Brian Havard <brianh@kheldar.apana.org.au>
2002-04-11 17:22:11 +00:00
Jan Lehnardt 49d6f53007 - add quotes. Cought by: Roman Neuhauser <neuhauser@mail.cz> 2002-04-11 17:20:47 +00:00
Sebastian Bergmann bdc27671cd Update README. 2002-04-11 17:01:51 +00:00
Joseph Tate 504b9beae6 Added versioning to dll and exe files created under windows.
#Note that these do not require modification when the version number changes.
#Utilizes the new partitioned version number defines in php_version.h

@ Added version info to the dll and exe files created under Windows. (jtate)
2002-04-11 16:31:22 +00:00
Wez Furlong ccbf1b84ee sync with PHP_MAJOR_VERSION changes to configure.in 2002-04-11 15:50:32 +00:00
Wez Furlong ae37223657 Apply patch for MAJOR_VERSION etc. by Joseph Tate 2002-04-11 15:15:33 +00:00
Yasuo Ohgaki 25db882a77 Fix ZTS build
# Please check caller when you add TSRMLS_DC. Especically if it's PHPAPI function...
# find . -name "*.c" | xargs grep php_mail
2002-04-11 13:40:19 +00:00
Wez Furlong 4adb1e58eb Fix declarations (Thanks Sebastian) 2002-04-11 12:13:17 +00:00
Alexander Merz a272bc81bb use DIRECTORY_SEPERATOR 2002-04-11 10:51:27 +00:00
Marcus Boerger 4407312d4f thread safe 2002-04-11 08:07:22 +00:00
Marcus Boerger e76b401f32 fix build (hopefully for BSD, too) 2002-04-11 07:28:24 +00:00
Marcus Boerger 628e639c08 fix warning 2002-04-11 07:26:53 +00:00
Marcus Boerger 42dc682626 fix testproblem 2002-04-11 06:41:55 +00:00
Sebastian Bergmann 38af983c80 Patch by Aaron Bannert <aaron@clove.org> and Cliff Woolley <jwoolley@virginia.edu>. 2002-04-11 06:01:54 +00:00
Sascha Schumann 7b6012cbfb properly reset ac_extra in PHP_NEW_EXTENSION
redirect stderr to /dev/null to silence xargs

Noticed by: Andrei
2002-04-11 05:47:03 +00:00
Yasuo Ohgaki 932e33e259 TSRMG => TSRMLS 2002-04-11 05:06:16 +00:00
973fe12d6d NEWS update 2002-04-11 00:25:15 +00:00
fde8ae2074 ChangeLog update 2002-04-11 00:23:36 +00:00
Wez Furlong 8dd62722c4 fix warning 2002-04-10 23:51:48 +00:00
Wez Furlong e1d0a14790 Implement stream context and status notification system.
Bump the BC for zlib notice to a warning
# See my RFC to php-dev a few days ago
2002-04-10 22:42:32 +00:00
foobar 3eafd2207c MFZE1 2002-04-10 21:33:34 +00:00
foobar 60ccb411ba MFZE1 2002-04-10 21:23:01 +00:00
foobar 5a92358183 - Added __FUNCTION__ and __CLASS__ constants. 2002-04-10 21:22:10 +00:00
Stig Bakken e8ad66aa49 * add download command to description 2002-04-10 21:09:58 +00:00
Tomas V.V.Cox ca0b7690c8 Implemented "pear download <pakage>" 2002-04-10 15:15:12 +00:00
Tomas V.V.Cox dfba9e63ab Do not show the "tag it!" message when verbose=0
# Forgot to commit that before
2002-04-10 15:10:49 +00:00
Tomas V.V.Cox a332c8c27b Added single display() 2002-04-10 15:09:36 +00:00
Uwe Steinmann 281b5d96e2 - extension to access a Hyperwave Server based on the official
Hypwerwave SDK. The function of this module is similar to the
	existing hyperwave extension but the api is very different.
2002-04-10 13:33:59 +00:00
Marcus Boerger 4e1a645ab0 fix a warnig and an error (found by Sebastioan) 2002-04-10 13:02:53 +00:00
Rui Hirokawa 1f847267e7 changed mbstring to make thread safe. 2002-04-10 12:47:41 +00:00
Tomas V.V.Cox f833895afd Help for command "shell-test" 2002-04-10 12:40:06 +00:00
Tomas V.V.Cox 3788b31b0e Added "pear package -n" (only output the created package file name) 2002-04-10 12:23:31 +00:00
Sascha Schumann 297ee300de ws changes 2002-04-10 12:22:36 +00:00
Sascha Schumann dc56d2d050 Replace all memsets with variable initializations
Change flow of code in functions to end in the "positive" branch.

Changes verified using the original php3 dba tests.
2002-04-10 12:16:31 +00:00
Sascha Schumann 1eb8ee6f6d too quick. full speed back. 2002-04-10 11:12:19 +00:00
Sascha Schumann 1ed150172a Please test patches which are merged into the release branch.
db2 has a standard UNIX API which in turn means that
it returns non-zero in error conditions.
2002-04-10 11:10:17 +00:00
Sebastian Bergmann 48b70510ba Fix Win32 build. 2002-04-10 11:08:44 +00:00
foobar 6958369295 Let people know this stuff is experimental. 2002-04-10 09:42:38 +00:00
Derick Rethans a19078870e - Fix defines 2002-04-10 06:22:12 +00:00
Marcus Boerger bd9cf79efb new ini setting log_errors_max_len
@-New ini setting log_errors_max_len controls maximum length for error
@ messages. Set it to 0 for infinite. Default is 1024 (old behaviour) (Marcus)
2002-04-10 01:27:44 +00:00
Marcus Boerger f140a8dd0d fix exif using vspprintf 2002-04-10 01:18:52 +00:00
Marcus Boerger 3e70f373ce make (v)spprintf available 2002-04-10 01:13:18 +00:00
Marcus Boerger c664a0a202 introducing spprintf and vspprintf
#mail follows
2002-04-10 01:09:22 +00:00
Marcus Boerger d3e97520d9 -preface for new vpprintf
#reordered and renamed some functions and removed some static
2002-04-10 01:07:49 +00:00
bab62092c4 ChangeLog update 2002-04-10 00:23:15 +00:00
Stig Bakken 49445bbee0 * ignore dirs and libfiles in older releases (changelog) 2002-04-09 22:30:44 +00:00
Stig Bakken 7e7676f8fb * ignore files in older releases (changelog) 2002-04-09 21:48:19 +00:00
jim winstead f5b7d979c0 Fix bug #15835. 2002-04-09 20:18:09 +00:00
Stig Bakken 22673618f7 * drop the ondemand connect stuff for now 2002-04-09 18:57:28 +00:00
Stig Bakken 96213680ca * add preferred_state 2002-04-09 18:51:31 +00:00
Stig Bakken 28452d5dc0 * drop file replace= attribute 2002-04-09 18:50:54 +00:00
Stig Bakken 704713caf8 * remove extra end-fold 2002-04-09 17:32:39 +00:00
Sterling Hughes 53fdf83f09 eekk -- and ssb thought my macro's were icky :) 2002-04-09 17:25:13 +00:00
Stig Bakken e91f94a259 * package-validate uses package.xml as default param 2002-04-09 17:15:17 +00:00
Stig Bakken 3c03ca3d7b * ext/xml/expat no longer has xmltok and xmlparse subdirs 2002-04-09 16:06:07 +00:00
Tomas V.V.Cox 4c125afc74 Make the dependencies check look for the correct registry file 2002-04-09 14:12:12 +00:00
Alexander Merz eb85e073e5 Win95/98/Me doesn't support locking, please check patch on other systems 2002-04-09 14:00:05 +00:00
Tomas V.V.Cox dc811f3041 Fix package-list not showing the right Install path 2002-04-09 13:49:47 +00:00
Tomas V.V.Cox ebb85a3738 Fix a problem when list-installed is called in a new installation 2002-04-09 13:11:51 +00:00
James Cox c602369f81 it's been changed back to php.exe 2002-04-09 09:59:17 +00:00
Alexander Merz f6cc322d7d updated, requires PHP4.2 php-cgi 2002-04-09 09:28:04 +00:00
Stig Bakken efa18af7e1 * show full cvstag command 2002-04-09 08:19:53 +00:00
Stig Bakken 8efdf7bc37 * get rid of CommandResponse stufff 2002-04-09 08:18:49 +00:00
Stig Bakken 2dc974d72d * drop file replace= attribute 2002-04-09 08:17:49 +00:00
Stig Bakken f2efded1bc * remove PEAR/Uploader.php 2002-04-09 08:12:18 +00:00
Stig Bakken 6b8c7db275 * unused files 2002-04-09 08:11:22 +00:00
Stig Bakken 894cbdf3d2 * implemented role="script" and <replace> substitution during install 2002-04-09 08:10:12 +00:00
Sterling Hughes 11acdb097d fix compile warnings 2002-04-09 06:13:00 +00:00
764f06b588 NEWS update 2002-04-09 00:22:01 +00:00
f3d1a92c47 ChangeLog update 2002-04-09 00:20:15 +00:00
Stig Bakken be65ac95cc * package definition for the base PEAR system 2002-04-09 00:03:44 +00:00
Stig Bakken 6c00a56766 HEADS UP, package.xml format change:
<file>foo.php</file> is now <file name="foo.php/>
Added tags for configure-like substitutions.
# the packager will handle both for a while
2002-04-09 00:03:18 +00:00
Mark L. Woodward 5e5bccccaa Added new features for msession beta 2 2002-04-08 23:07:23 +00:00
foobar 7cafcc1ef5 ws fix 2002-04-08 22:54:06 +00:00
foobar edead0523b CPP directives must start on the beginning of line 2002-04-08 22:21:08 +00:00
Richard Heyes f006b2bbc3 * Added getStaticProperty() for static methods. 2002-04-08 21:03:41 +00:00
foobar e3cc458d25 - Revert that change. Added a warning about this. 2002-04-08 18:43:35 +00:00
Yasuo Ohgaki 001d332a86 Make pgsql header available for PECL module(s) 2002-04-08 14:17:28 +00:00
foobar 14a6bc6d69 upload_max_filesize can only be set in php.ini 2002-04-08 07:58:47 +00:00
foobar ee20639c7f and the news entry.. 2002-04-08 07:47:50 +00:00
foobar 77c058a06a There's really no point in allowing using the system regex library. 2002-04-08 07:47:17 +00:00
foobar 23a3cc71e3 Using system regex lib seems not to work quite well when compiled with Apache. 2002-04-08 06:45:52 +00:00
Derick Rethans cbed0567aa - Fix wrong logic (Thanks to Alan for noticing it) 2002-04-08 06:36:03 +00:00
Yasuo Ohgaki 34625daf18 Remove unneeded conversions from pg_convert. 2002-04-08 04:21:04 +00:00
Tomas V.V.Cox 2a1e0a53bb Continue the list of features for PEAR DB
Release version is 2.0 (apiVersion)
# Multiline entries inside the tags looks better in the web or in
# "pear package-info" if they aren't formatted to look better
# in the xml
2002-04-08 02:22:48 +00:00
Yasuo Ohgaki d023a96cc6 Make it compile with ZTS.
# Forgot to test with ZTS
2002-04-08 02:01:45 +00:00
Yasuo Ohgaki 8fab36f99c Update README 2002-04-08 01:50:06 +00:00
Yasuo Ohgaki 4ac70c6821 Added pg_metadate(), pg_convert(), pg_insert(), pg_select(), pg_update()
and pg_delete().
@ Added pg_metadate(), pg_convert(), pg_insert(), pg_select(), pg_update()
@ and pg_delete(). (Yasuo)
2002-04-08 01:37:38 +00:00
Yasuo Ohgaki 7d48177f37 Return proper result. 2002-04-08 00:50:44 +00:00
foobar 7770fd5710 Some ws fixes and general cleanup. 2002-04-08 00:46:23 +00:00
Yasuo Ohgaki 994cdb4b14 Added 2nd parameter for pg_result_status(). PGSQL_STATUS_LONG is for LONG result status.
PGSQL_STATUS_STRING is for SQL command name successfully executed for this result.
@ Added 2nd parameter for pg_result_status() to specify return type. (Yasuo)
2002-04-08 00:43:58 +00:00
091a06946d ChangeLog update 2002-04-08 00:23:10 +00:00
Marcus Boerger 59f332800f correcting some more whitespace
#hope that's it
2002-04-07 23:30:01 +00:00
foobar e034d43ccf Fixed compile failure with ZTS build. 2002-04-07 22:43:17 +00:00
Stig Bakken 79a150068a * append "?uncompress=yes" to the package download url if zlib extension
is not loaded
2002-04-07 21:09:41 +00:00
Stig Bakken 46dd841b28 * package xml file for DB 2002-04-07 21:02:54 +00:00
Andi Gutmans 35befd3eb3 - Fix build with Visual Studio .NET. The MySQL team said they'll commit
- their fix a long time ago and never did. One day they'll update the
- whole MySQL client library.
2002-04-07 20:49:10 +00:00
Tomas V.V.Cox 6ac6b78818 Added PEAR_Common::getUserRoles() and a suggestion 2002-04-07 20:47:04 +00:00
Hartmut Holzgraefe 954dbb2d35 fix and regression test for Bug #16473 2002-04-07 19:46:45 +00:00
Stig Bakken 6303972256 * added "cvstag" command 2002-04-07 19:42:05 +00:00
Marcus Boerger bba604b3d8 -fix warnings
-fix layout
2002-04-07 18:45:30 +00:00
Marcus Boerger 0743669f1c -fix warnings 2002-04-07 18:09:31 +00:00
foobar 80131be70f Removed relics from PHP3. 2002-04-07 17:46:57 +00:00
Stanislav Malyshev a68b448169 make compatible with current PHP 2002-04-07 17:12:38 +00:00
Stig Bakken 8ec2ae71db * give PEAR_Packager::package an option to disable compression and make
plain .tar files
2002-04-07 17:07:49 +00:00
Stig Bakken d6d8d78754 * remove empty fold 2002-04-07 16:51:17 +00:00
Stig Bakken 5bdc0eaafe * use the UI's displayFatalError method 2002-04-07 16:48:24 +00:00
Stig Bakken 6718d569bd * added displayError and displayFatalError methods 2002-04-07 16:47:36 +00:00
Stig Bakken 49b11adf7c * initialize _PEAR_Command_uiobject 2002-04-07 16:42:33 +00:00
Sterling Hughes c89623d27f apply jan's configure check for apache2 and freebsd (relating to the use
of tsrm-pth).
2002-04-07 16:16:47 +00:00
Stig Bakken 255bbff361 * leave error reporting to the validator 2002-04-07 15:49:23 +00:00
Stanislav Malyshev 3b6b13b08a sync 2002-04-07 15:38:45 +00:00
Stig Bakken 065da3a0fa * more clear cvs tag hint 2002-04-07 15:07:26 +00:00
Tomas V.V.Cox 361cebe460 Just some help cleanup 2002-04-07 14:30:32 +00:00
Stig Bakken 73f4b5b2fa * typo 2002-04-07 13:22:21 +00:00
Stig Bakken 5179e9d0fa * rename package-verify command to package-validate 2002-04-07 12:40:51 +00:00
Wez Furlong 1f2344104f fix for #16469 2002-04-07 10:56:30 +00:00
Stig Bakken dc974a0299 * support for .tar files in PEAR_Installer
* new command: package-verify
* "package" command now sanity-checks the package information before
  making the tarball
* -Z option to the install/update commands for downloading non-compressed
  packages
2002-04-07 10:38:04 +00:00
Yasuo Ohgaki efbb9949a5 Added pgsql.ignore_notice and pgsql.log_notice ini entry. 2002-04-07 06:11:41 +00:00
Yasuo Ohgaki dbe3dfda5f Nuke waring with ZTS build 2002-04-07 05:21:43 +00:00
Yasuo Ohgaki 0cace44107 Fixed ZTS build 2002-04-07 05:20:16 +00:00
foobar de65bee975 Fixed bad entries. 2002-04-07 01:58:17 +00:00
1422bd2505 NEWS update 2002-04-07 01:20:51 +00:00
2dda958975 ChangeLog update 2002-04-07 01:20:03 +00:00
Marcus Boerger ddc6437e32 new feature ignoring repeated error messages (defaults to old behaviour)
@You can now disable logging of repeated error messages with two new ini settings ignore_repeated_errors, ignore_repeated_source. @(Marcus)
2002-04-06 18:49:59 +00:00
Wez Furlong 62538caa86 Added BC support for old style zlib: wrapper.
Added notice when a requested wrapper is not found.
# This BC thing was giving me nightmares.
# It took me 10 minutes to realize I hadn't compiled in zlib support also.
2002-04-06 17:29:39 +00:00
Derick Rethans d449021900 - Fix zzip_entry_read 2002-04-06 17:28:58 +00:00
Richard Heyes d3c0d67060 * Added registerShutdownFunc() method 2002-04-06 17:01:14 +00:00
Sebastian Bergmann 777bc9f954 Fix output directory. 2002-04-06 15:45:00 +00:00
Sebastian Bergmann b0eb69ecc0 Fix output directory. 2002-04-06 15:37:08 +00:00
Tomas V.V.Cox 02bff6ce0e Fix bug in pushErrorHandling() (fail under very specific circumstances) 2002-04-06 15:12:04 +00:00
Sascha Schumann 8fae36cbd1 Improve the life of external extension maintainers by
not plaguing them with "./" in absolute paths.

Requested by: Andrei, Wez
2002-04-06 13:42:40 +00:00
foobar e537d2bd7d minor fix.. 2002-04-06 13:29:05 +00:00
Sebastian Bergmann db840b8001 Fix Debug_TS build. 2002-04-06 08:57:06 +00:00
Yasuo Ohgaki 179a52b025 Chages for new pg_last_notice() 2002-04-06 06:42:02 +00:00
Yasuo Ohgaki b2fce9e893 Make pg_last_notice() work as it is designed. It returns last notice message for connection resource specified.
Added "pgsql.ignore_notice" ini entry.
Added "pgsql.log_notice" ini entry.
@ Make pg_last_notice() work as it is designed. It returns notice message PostgreSQL connection resource specified.
@ Added "pgsql.ignore_notice" ini entry.
@ Added "pgsql.log_notice" ini entry.
2002-04-06 05:52:52 +00:00
Andrei Zmievski 0141256493 - Fixed a leak in xml_decode().
- Fixed it so it's possible to compile as a shared extension.
2002-04-06 03:50:28 +00:00
345cee6bf7 NEWS update 2002-04-06 01:20:17 +00:00
d0d78eb783 ChangeLog update 2002-04-06 01:19:25 +00:00
Yasuo Ohgaki 65ba307319 Use get_active_function_name() for error messages. 2002-04-06 01:01:41 +00:00
Stig Bakken de1f6319ec * forgot htmlspecialchars in release notes 2002-04-06 00:58:22 +00:00
Joseph Tate 5ae6b3e17a Added test suite for domxml extension.
#eventually I'll separate all the tests into separate files, but until
#then, I'll commit it so that everyone can use it.
2002-04-05 20:55:37 +00:00
Joseph Tate 7954c7bafe Added unlink_node alias for consistency 2002-04-05 18:18:23 +00:00
Marcus Boerger 313503aa92 -testing unicode user-comment 2002-04-05 18:05:48 +00:00
Marcus Boerger 8a388954ea -correct length for ASCII
-global encoding variables
#will become ini settings explanation on what to set follows then
2002-04-05 17:59:29 +00:00
Marcus Boerger 1185a30687 include comma separated encoding lists in test 2002-04-05 16:25:05 +00:00
Marcus Boerger cbb96206be no space for comma separated encoding lists 2002-04-05 16:24:08 +00:00
Marcus Boerger b3a96ba509 aligning #
#mentioned by derick
2002-04-05 16:02:54 +00:00
Christian Stocker 672586726e oops. that was an error not detected in shared library mode ... 2002-04-05 15:47:08 +00:00
Christian Stocker e448122bd5 added domxml_parser(), domxml_parser_add_chunk() and domxml_parser_end().
It provides access to the PushParser interface of libxml2.
2002-04-05 15:27:52 +00:00
Stig Bakken dedf2a4c39 @Add zlib.output_compression_level option (Stig) 2002-04-05 13:07:43 +00:00
foobar 16d7d7bdd2 Fixed some entries.. 2002-04-05 11:59:58 +00:00
Zeev Suraski 385b233040 Fix gzip/bz2 builds for Windows 2002-04-05 11:51:43 +00:00
Yasuo Ohgaki 1abb9cd02c Add error message from _notice_handler()
# Currently, it always logs whennever notice message is
# recieved. I'll change error log optional later.
2002-04-05 07:57:33 +00:00
Yasuo Ohgaki 3dab8a24f9 FMB. Fixed bug info. 2002-04-05 07:17:30 +00:00
Yasuo Ohgaki 7f2446e7de Fix pg_last_notice() double free.
# This should be merged
2002-04-05 06:37:26 +00:00
Yasuo Ohgaki a9452edac7 Add notice message test
# Need to figure out why estrduped string is not null terminated
2002-04-05 06:30:18 +00:00
Yasuo Ohgaki d84f0e5530 Update message 2002-04-05 06:07:46 +00:00
Yasuo Ohgaki 04691a516b Add bytea field to test table.
Use table name variable.
2002-04-05 06:06:21 +00:00
Yasuo Ohgaki 22007a29de Add real pg_escape_bytea() test. 2002-04-05 06:05:28 +00:00
Yasuo Ohgaki eb7ed9105a Fixed way of exporing functions. (Need PHPAPI for Win)
Fixed if statement format. ("if () stmt;" should be "if () \n {stmt;}")
Fixed error message so that appropriate function names are
displayed.
2002-04-05 02:13:32 +00:00
Marcus Boerger d0de28ece4 Unicode is now based on php_mb_convert_encoding if available
#currently only ISO-8859-15 is supported as result
#maybe this will become an ini setting
2002-04-05 01:25:53 +00:00
Marcus Boerger cb51e72c46 new function php_mb_convert_encoding 2002-04-05 01:23:22 +00:00
a663bd9966 NEWS update 2002-04-05 01:21:31 +00:00
62350d574d ChangeLog update 2002-04-05 01:20:46 +00:00
Wez Furlong 5916b203fe add mbstring headers to those for pear/pecl extensions 2002-04-05 00:16:09 +00:00
Marcus Boerger bc6d302fcf removed calls to wctomb, wcstombs
#leave UNICODE to user
2002-04-04 20:45:53 +00:00
Sterling Hughes 5dd3477b0d i of course am the brilliant author of these files 2002-04-04 20:22:03 +00:00
Sterling Hughes f30b124b93 replace with non-gpl implementation 2002-04-04 20:14:47 +00:00
Sterling Hughes c57f3c562d non gpl implementation 2002-04-04 20:11:11 +00:00
Sterling Hughes 223e2e0bdb replace grp.h with a new implementation (non-GPL) 2002-04-04 20:10:20 +00:00
jim winstead e7d5c0e253 mailparse moved to pear/PECL. 2002-04-04 18:43:59 +00:00
Sander Roobol cebaafba15 Fixed build with multiple concurrent jobs (make -j) 2002-04-04 18:15:52 +00:00
Sander Roobol 49679a723e Fixed typo 2002-04-04 18:15:04 +00:00
Yasuo Ohgaki 24b76bba21 Fix tests 2002-04-04 15:25:46 +00:00
foobar d658b1a8d7 Revert the bogus patch. 2002-04-04 14:33:05 +00:00
Yasuo Ohgaki 68f8029fbb Added pg_escape_*() test 2002-04-04 13:59:44 +00:00
Yasuo Ohgaki fafea27a2d Clean up pg_escape_*() 2002-04-04 13:54:51 +00:00
Christian Stocker afeda57153 - fixed a lot of memory leaks (by Lukas Schroeder)
- get_attribute() returns False instead of empty string, if attribute not found
2002-04-04 12:16:48 +00:00
Yasuo Ohgaki 186823957a Fixed crash with pg_escape_*()
# I'll MFH later.
2002-04-04 10:25:12 +00:00
Sascha Schumann e50a42f907 Add deferred libs to DLIBS instead of LIBS.
Noticed by: Jani Taskinen <sniper@iki.fi>
2002-04-04 10:03:29 +00:00
Daniela Mariaschi c02a5dcc1d Fixed sigfault in ibase_close(). Bug #15419 #15992
@- Fixed sigfault in ibase_close() if user doesn't free resultset
@  (Bug #15419, #15992) (daniela)
2002-04-04 02:15:47 +00:00
7779d3de92 ChangeLog update 2002-04-04 01:18:47 +00:00
foobar f162b5f6dd minor fixes 2002-04-04 01:01:26 +00:00
Marko Karppinen ef0d337850 Added news on the Mac OS X changes and removed a duplicate line 2002-04-04 00:44:47 +00:00
foobar 97ba30ba5c - OS X support for dynamically loaded extensions. (patch by Marko)
# NEWS entry coming up..
2002-04-04 00:24:34 +00:00
Sterling Hughes 7201d8b54e fix bug #15150, thanks to daniel at haxx.se for the fix 2002-04-03 23:59:36 +00:00
Derick Rethans 755b8542e4 - Fix as suggested my Marcus 2002-04-03 19:50:02 +00:00
Yasuo Ohgaki ee26bf084d Added ini_set()/ini_get()/ini_restore() test 2002-04-03 14:34:45 +00:00
Wez Furlong fea3b0a7f8 fix TS build 2002-04-03 13:47:21 +00:00
Wez Furlong 27d1f7db16 Tidy up win32 implementation of proc_open.
Respect safe_mode_exec_dir.
Implement proc_close and return process return code under win32.
2002-04-03 13:39:35 +00:00
Wez Furlong 74dd73711b add test for mailparse_extract_part_file 2002-04-03 13:38:43 +00:00
5f53f02d14 ChangeLog update 2002-04-03 01:23:27 +00:00
Wez Furlong a0f165a5cb main/streams.c 2002-04-02 16:46:33 +00:00
Wez Furlong abc5a2cacb fix quoting 2002-04-02 16:45:10 +00:00
Derick Rethans b0970a3b27 - Fix layout 2002-04-02 12:54:21 +00:00
Stig Bakken d4dfead250 * Added "-s" (soft update) option to install/upgrade. Will make installs
fail silently.
2002-04-02 09:21:48 +00:00
Stig Bakken f8fc50b922 * add Frontend support to PEAR_Common::log() 2002-04-02 09:21:08 +00:00
Stig Bakken dfa3b671f7 * Implemented "shell-test" command for writing shell scripts that check
whether a package is installed.  Example of use:

    if ! pear shell-test Net_Socket; then
        echo "You don't have the Net_Socket package installed!" >&2
        exit 1
    fi
2002-04-02 09:20:28 +00:00
Stig Bakken 9de06e3662 * just renaming some comments 2002-04-02 09:18:07 +00:00
Stig Bakken 7ddaefba34 * add type property telling what type of frontend this class implements 2002-04-02 09:15:51 +00:00
Stig Bakken 812d9bf3c4 * remove "exit" at the end, it causes a "false" exit code always 2002-04-02 09:10:23 +00:00
Stig Bakken 990d19aefe * comment out the php files that are not necessary for the installer
# the rest will show up as packages in /pear shortly
2002-04-02 09:09:41 +00:00
Derick Rethans f71adad3cf - Whitespace 2002-04-02 06:41:23 +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
da56fd7624 NEWS update 2002-04-02 01:19:24 +00:00
f98ac64101 ChangeLog update 2002-04-02 01:18:51 +00:00
foobar 8d151063d3 Be a bit more verbose about what was not found. 2002-04-02 00:04:53 +00:00
foobar 46d42968a4 Fix for bug: #5499 (no need to MFH this one) 2002-04-01 23:25:48 +00:00
foobar bccfe80480 Prevent crashing with some bogus POSTs. 2002-04-01 23:02:16 +00:00
Tomas V.V.Cox 750ca4295e typo 2002-04-01 19:17:59 +00:00
Tomas V.V.Cox b57e0609ad Added layer checks and reorganize a little the code 2002-04-01 19:16:01 +00:00
Tomas V.V.Cox 49dacbee8c - Define the PEAR constants when they are not set (be nice
with the "--wihout-pear" people who finally regrets)
- Added method getLayers()
2002-04-01 19:13:37 +00:00
Tomas V.V.Cox 6ec8fbc30e - Make "config-set" actually store the values
- Help and error messages enhance
2002-04-01 18:19:45 +00:00
Tomas V.V.Cox 827334cd2f - Added "nodeps" option to install/upgrade/uninstall
(pear install -n package.tgz)
- Finish to document the install commands
2002-04-01 17:25:42 +00:00
Kirill Maximov 33ed30fce8 (PHP quoted_printable_decode) Fixed CR/LF processing for Windows/OS2
@ Fixed CR/LF processing for Windows/OS2 in quoted_printable_decode (kir)
2002-04-01 17:03:01 +00:00
Tomas V.V.Cox def4a8485d - Set some php.ini values needed by the installer
- Removed unused present_array() and heading() functions
2002-04-01 16:49:19 +00:00
Tomas V.V.Cox 7b68037886 People reported problems with flock(LOCK_SH) and fopen('w') 2002-04-01 16:10:39 +00:00
Tomas V.V.Cox 6e8268e4a4 added help 2002-04-01 15:23:46 +00:00
Tomas V.V.Cox 1924492aed Adaptation for the new help system 2002-04-01 14:35:08 +00:00
Tomas V.V.Cox edab1197f3 Go with the help system 2002-04-01 14:32:40 +00:00
Stig Bakken 0c7f16bd96 * typo 2002-04-01 14:15:30 +00:00
Derick Rethans f4447a9cc1 - Fix for bug #14966 2002-04-01 09:19:57 +00:00
Markus Fischer 700b9eb734 - Nuke *FETCH macros. 2002-04-01 08:05:17 +00:00
Marcus Boerger 0fd732214a #cleanup source 2002-04-01 03:15:57 +00:00
Mark L. Woodward 3828c26a8d PHP_SESSION_API not always defined. 2002-04-01 01:38:53 +00:00
d92c9f73c3 ChangeLog update 2002-04-01 01:18:47 +00:00
Markus Fischer ab2194d1da - Fix compilation.
# Marcus, could you please fix the whitespace in this file?
2002-03-31 23:00:31 +00:00
Tomas V.V.Cox 460eb1103c E_ALL fix 2002-03-31 19:04:53 +00:00
Tomas V.V.Cox ed450a6c4e if (!function_exists('md5_file')) { ... 2002-03-31 19:04:26 +00:00
foobar 6214164d28 Fixed the build issues reported by Stas. 2002-03-31 15:41:24 +00:00
foobar 63ec2d9ff7 missing .cvsignore 2002-03-31 15:39:33 +00:00
Stanislav Malyshev ee3a873863 Fix ZE2 builds 2002-03-31 13:02:36 +00:00
Mark L. Woodward f83d005d46 Fixed conditional compilation based on macros changed in
ext/session/php_session.h which changed.
2002-03-31 05:38:10 +00:00
Stig Bakken 561ac3d54e * E_ALL fix 2002-03-31 03:16:02 +00:00
Stig Bakken f1c803a41c * avoid object copying 2002-03-31 01:51:08 +00:00
Stig Bakken 5e13ee1428 * oops, config object was copied
* call parameters were not passed on to xmlrpc_encode_request()
2002-03-31 01:45:36 +00:00
Yasuo Ohgaki 266692a59a Print multibyte and SSL support is compiled in libpq or not. 2002-03-31 01:45:22 +00:00
3e67ad4dfa ChangeLog update 2002-03-31 01:19:42 +00:00
Yasuo Ohgaki 7ff1412432 Print PostgreSQL version number in phpinfo() 2002-03-31 01:18:32 +00:00
Stig Bakken c5d35962d2 * install PEAR/Command/Remote.php 2002-03-31 00:32:00 +00:00
Stig Bakken 03c82d38ef * added sys/utsname.h test 2002-03-30 23:44:50 +00:00
Rasmus Lerdorf 9c57dffecd Looks like mawk can't handle create_stubs - if someone is keen it would be
nice to fix that, but for now just make a note that gawk may be needed.
2002-03-30 16:44:56 +00:00
Sascha Schumann 3a3acee3c9 - Proper use of underscores (s/createsid/create_sid/)
- Bump the API date and remove extra cpp macro
- Pass TSRMLS appropiately to the create_sid function
2002-03-30 16:29:15 +00:00
Marcus Boerger e4f4386758 -compiler warnings 2002-03-30 14:28:05 +00:00
Marko Karppinen 676afb33b8 Enable --with-apxs build on Mac OS X. We build an MH_BUNDLE instead of
an MH_DYLIB. As all PPC code is relocatable, we don't use the libtool
based shared build but go a static route. Goodbye libtool!
# I'm committing this to enable widespear testing.
# Anyone have any ideas on how to easily backport this to 4.2.0?
2002-03-30 03:17:25 +00:00
foobar f43ca8d2bc Fixed a bug with file_uploads=off -> normal post variables not set. 2002-03-30 02:58:19 +00:00
Markus Fischer e4d2fa88d7 - Fix #16348. 2002-03-30 01:56:52 +00:00
ae336171bd ChangeLog update 2002-03-30 01:19:21 +00:00
Marko Karppinen 1ca5d55925 Mac's Find By Content indexing sprinkles these annoying files around 2002-03-29 20:10:39 +00:00
Marko Karppinen 60663c1f64 Prepare for MH_BUNDLE build on Mac OS X / Darwin 2002-03-29 19:25:55 +00:00
Sander Roobol ef2608925c Updating tests: remove alternative syntax in tests, added a special
alternative-syntax testfile.
2002-03-29 17:12:11 +00:00
Sander Roobol 4e8f9e2585 Added crack extension to php.ini-* 2002-03-29 16:32:23 +00:00
Mark L. Woodward 346d74a146 Added field to ps_module structure to hold function pointer for the creation
of the session ID string. Default PS_MOD() macro sets this to be the default
creation routine. PS_MOD_SID() macro sets this to a handlers session ID
creation routine.
2002-03-29 16:00:27 +00:00
Doug MacEachern eab1211ed1 adjust to recent apr bucket api changes 2002-03-29 15:42:18 +00:00
foobar acb218bf4c - Added missing entry for mysql_info() and fixed some entries 2002-03-29 13:05:08 +00:00
foobar a0e3bd8f0e WS fix 2002-03-29 12:56:25 +00:00
Jan Lehnardt bc19dd6900 - add mysql_info function 2002-03-29 12:47:02 +00:00
Derick Rethans 17116438da - revert patch 2002-03-29 12:34:25 +00:00
Yasuo Ohgaki c7d72bb20d Fix build failure with PostgreSQL 6.5.x
# I'll merge this to 4.2.0 branch later
2002-03-29 11:24:54 +00:00
Stig Bakken 7f89d8c13a (PHP php_uname) display runtime uname rather than compile-time uname, added
an optional parameter to get single fields (like uname(1))
# Windows version is not tested, and I didn't know how to get
# `uname -n` on Windows, so it's hardcoded to "localhost" for now.
# Windows gurus feel free to fix. :-)
2002-03-29 10:19:23 +00:00
Yasuo Ohgaki 7e570674cd Trying to be more clear. 2002-03-29 08:34:02 +00:00
Stig Bakken 69df28337b * implemented "pear list-upgrades", which will show you what releases
are available on the server (shows newer releases with the same state)
2002-03-29 02:41:28 +00:00
Stig Bakken 45878bff77 * always require PEAR/Common.php 2002-03-29 02:39:33 +00:00
Stig Bakken f6e4eea39a * allow "any" as a preferred_state value 2002-03-29 02:38:07 +00:00
Stig Bakken 99cfda3756 * pass on xmlrpc faults as pear errors 2002-03-29 02:17:55 +00:00
Yasuo Ohgaki 0090003920 Added class method registration test. It does not test
for multiple method definitions due to test script limitation.
# Current CVS source w/o my patch should fail, though.
2002-03-29 02:03:27 +00:00
Yasuo Ohgaki 99723b511e Change title to reasonable one.
# Shall we consider this as a bug or documentation problem?
2002-03-29 01:41:48 +00:00
Marcus Boerger efad4e4281 #and when the test does not result like you expect -> change test data
-fix test image
2002-03-29 01:33:30 +00:00
Marcus Boerger d0be2aabe4 -fix possible problem on low memory
-fix problem on failure
2002-03-29 01:32:26 +00:00
bf80594f6a NEWS update 2002-03-29 01:21:08 +00:00
aaf4f13910 ChangeLog update 2002-03-29 01:20:21 +00:00
Yasuo Ohgaki 266ba32b3c Fix ZE2 build. 2002-03-29 01:19:02 +00:00
Stig Bakken adc0b5741e * fix tempfile cleanup 2002-03-29 00:05:55 +00:00
Stig Bakken 84652eeb52 * per-command fold marks 2002-03-28 23:50:45 +00:00
Stig Bakken 62bff20267 * regenerate package.xml with file checksums 2002-03-28 23:49:34 +00:00
Stig Bakken 425cb1b04e * default dep rel attribute to 'has' 2002-03-28 23:45:16 +00:00
Stig Bakken a50c40cc24 * accept optional tmpdir arg in mkTempDir
* handle changelog releases without filelist
2002-03-28 23:44:31 +00:00
Andrei Zmievski 8474d7944d Cleanup. 2002-03-28 21:08:56 +00:00
Joseph Tate d5fde50a53 Fixed build of php4ts Release_TSDbg under Win32 2002-03-28 19:30:33 +00:00
Joseph Tate ab982d819a -Crack extension now available for Win32 platforms. You will need to
acquire the cracklib libraries from
 http://www.jtatesoftware.com/cracklib/.
@A project has been added to the crack extension to allow it to be compiled
@under Win32.  Cracklib libraries for Win32 are available from
@http://www.jtatesoftware.com/cracklib/.

#
#Will the person who does the releases for php for windows please be sure
#to add this to the list of extensions to be built.
#
#Will someone with doc karma add this extension to the list on the
#Installation on Windows Systems page:
#http://www.php.net/manual/en/install.windows.php.
#
#Will someone please add the following to php.ini-recommended and
#php.ini-dist:
#To the extensions list:
#;extension = php_crack.dll
#
#To the Module Settings section:
#[Crack]
##Modify the setting below to match the directory location of the cracklib
##dictionary files.  Include the base filename, but not the file extension.
#;crack.default_dictionary = 'C:\php4\lib\cracklib_dict'
#
#I will send a diff to the php-dev list.
#
#Thanks
2002-03-28 18:48:12 +00:00
Stig Bakken f5e745e848 * added preferred_state config keyword 2002-03-28 14:27:02 +00:00
Stig Bakken 78c020a3bb * added phpdoc
* now ready to support multiple versions of the package format
* don't parse dependencies in changelog
* fix libfile parsing
* default maintainer roles to 'lead'
* added infoFromString() method
* added xmlFromInfo() method to regenerate package.xml files
2002-03-28 14:07:33 +00:00
Stig Bakken 66d8ab4998 * added "platform" and "md5sum" attributes to <file> 2002-03-28 12:09:59 +00:00
Derick Rethans 0887298bd4 - Back out broken patch 2002-03-28 11:21:47 +00:00
Derick Rethans b0088fd883 - MFB for fix build for BSD: BSD_MAKEFILE and resolver functions. (Patch by
Melvyn Sopacua <msopacua@idg.nl>)
2002-03-28 07:59:42 +00:00
Derick Rethans 803d2b3154 - MFB 2002-03-28 07:36:02 +00:00
269bc38541 ChangeLog update 2002-03-28 01:21:15 +00:00
Wez Furlong 4361807185 add test for file_get_contents 2002-03-28 01:20:28 +00:00
Wez Furlong 959021a8c9 Add subject hash to parsed x509 data.
Make the test use file_get_contents().
2002-03-28 00:56:19 +00:00
Wez Furlong 2539cbc74c Phase 3 of OO wrapper cleanup
# What was phase 2?
2002-03-28 00:49:00 +00:00
Wez Furlong fa4341dcdf make quoted-printable encoding safe for use with digital signatures. Added some tests 2002-03-28 00:43:44 +00:00
foobar bf663c9746 Fixed bug: #16237 2002-03-27 23:47:06 +00:00
foobar 49ba2a983b WS fix 2002-03-27 22:49:21 +00:00
Joseph Tate 113f08bc4b Fixing compile warning under Win32 2002-03-27 21:45:45 +00:00
Marcus Boerger 406c665c13 recorrect las checkin 2002-03-27 21:01:26 +00:00
Hartmut Holzgraefe 492c837272 fix for Bug #16314 2002-03-27 20:20:57 +00:00
foobar 8f0390c708 autoconf 2.53 uses this directory for some temporary stuff 2002-03-27 15:43:48 +00:00
foobar cb104bbfb4 Moved these example scripts out of tests. 2002-03-27 15:39:30 +00:00
foobar 2d8c05bb38 - Fixed bug: #16203
# unconditionally adding libraries which are not even neeeded is evil.
2002-03-27 15:30:52 +00:00
Wez Furlong f870804c45 add test case for multiple To: lines 2002-03-27 14:07:48 +00:00
Wez Furlong 16fed222f6 allow headers hash to handle multiple To: lines 2002-03-27 14:05:56 +00:00
Hartmut Holzgraefe ad361b50dc not enabled by default 2002-03-27 13:54:09 +00:00
Hartmut Holzgraefe aba71d94e0 moved 'static' prototypes to prevent warnings 2002-03-27 13:51:55 +00:00
Hartmut Holzgraefe 65f93ba4f7 preparing for Content-Encoding detection 2002-03-27 11:56:42 +00:00
Sascha Schumann c7403326ab Factorize a few library/libpath-related functions 2002-03-27 11:09:20 +00:00
Sascha Schumann bc11acbf02 Defer linking against libmcal until we have built the extension,
so that extension-supplied symbols are available.

Also factorize the header file checks.

Reported by: Brandon Knitter
URL: http://news.php.net/article.php?group=php.dev&article=81833
2002-03-27 10:26:17 +00:00
Sascha Schumann a40b4ff52b Remove generated file 2002-03-27 10:06:24 +00:00
ca6ff78a8d ChangeLog update 2002-03-27 01:20:49 +00:00
Jon Parise 5237ff23e8 Ignore generated files. 2002-03-26 21:32:34 +00:00
Sean Bright 9fa1dd317d Fix typo. 2002-03-26 19:59:26 +00:00
Hartmut Holzgraefe 2875cb8a7f build conflicts fixed 2002-03-26 19:57:32 +00:00
Sander Roobol 9b6a8d2639 Fixed the array-tests. Broke the test up into various smaller tests.
Reduced the test data because it was unmanageable.
# I hope everything is ok :)
2002-03-26 18:17:38 +00:00
Tomas V.V.Cox b5f477ba00 E_ALL fixes 2002-03-26 16:31:13 +00:00
Tomas V.V.Cox 0e20c6e383 _lock() now returns PEAR Error or true for consistency 2002-03-26 16:29:53 +00:00
Marcus Boerger f277bf0c5c allow other modes to work with -- correct
#original idea was to allow this *only* for PHP_MODE_STANDARD
2002-03-26 14:43:57 +00:00
Marcus Boerger a2631c1f1d fix behaviour on --
#now php -- -i for scriptfile -i works
2002-03-26 11:22:20 +00:00
Sascha Schumann fb048880aa outcomment default linking against pam due to no feedback
regarding its purpose
2002-03-26 11:05:18 +00:00
Sascha Schumann 5428e463bd If an argument (<tag val=argument..) was not quoted, leave it that way. 2002-03-26 10:23:33 +00:00
Yasuo Ohgaki ec0c373992 Remove warnings 2002-03-26 08:49:36 +00:00
Yasuo Ohgaki c8a3623708 Changed error messages to be consistent with other error messages 2002-03-26 08:43:57 +00:00
Derick Rethans 13633cb945 - MFB 2002-03-26 08:29:14 +00:00
Markus Fischer f521ae3f30 - Fix bug 11244 (patch by "Tal Peer" <hazgul99@hotmail.com>).
# Sorry for the delay :-)
2002-03-26 07:57:07 +00:00
e74c66bb14 ChangeLog update 2002-03-26 01:19:23 +00:00
foobar edb03cdbb4 - Use correct header file. 2002-03-26 00:14:27 +00:00
foobar 11bcc2207e MFB. (I must have been sleep-walking..) 2002-03-26 00:14:02 +00:00
Wez Furlong 74749ad642 Fix regular openssl_pkey_get_private($content, $phrase) syntax and
add test case.
This stuff should be merged into the 4.2 branch.
2002-03-26 00:03:11 +00:00
foobar f4736c72ea Why was this here?? 2002-03-25 23:46:22 +00:00
Sterling Hughes 64c894b164 Whitespace fixes 2002-03-25 22:49:25 +00:00
Derick Rethans 7394b8fc6f - MFZE1 2002-03-25 20:37:02 +00:00
Georg Richter 6a0bf08ce3 fixed prototype for mysql_ping 2002-03-25 12:09:38 +00:00
d068c23bba NEWS update 2002-03-25 01:22:42 +00:00
8b0771cfe0 ChangeLog update 2002-03-25 01:21:47 +00:00
Sterling Hughes 7ae1dd662f more zend_parse_parameters fixup 2002-03-25 01:19:59 +00:00
Sterling Hughes 3c3ae850a2 Fix-up the last fix a bit
Clean up mysql_list_processes
2002-03-25 01:14:30 +00:00
Hartmut Holzgraefe d2b8655775 pproto fix 2002-03-25 01:08:39 +00:00
Sterling Hughes 05475d809b clean up mysql_real_escape_string() a bit
# I really think we should just add a database handle
# parameter to mysql_escape_string()
2002-03-25 01:07:23 +00:00
Hartmut Holzgraefe 14e298f805 initial checkin 2002-03-25 00:42:37 +00:00
Zak Greant 3fae05b014 Added mysql_table_name() alias for mysql_tablename()
Improved logic of parameter parsing code for mysql_ping
 - made test for no arguments more explicit
 - combined to if blocks into one if/else if block
2002-03-24 23:33:07 +00:00
Jan Lehnardt 26e1958c8e - added basic output buffering tests 2002-03-24 23:16:42 +00:00
Hartmut Holzgraefe 2c413f116a 1st implementation of magic-file based mime_content_type(string filename) 2002-03-24 23:00:47 +00:00
Alex Waugh 0f3b304506 Backslashes caused the build to fail with autoconf 2.52 2002-03-24 22:57:00 +00:00
Sterling Hughes ad8b00be3e fix freebsd compile 2002-03-24 21:16:02 +00:00
Sander Roobol f12dfba7e0 Fixed tiny mistake in proto (tnx to Egon for spotting it). 2002-03-24 18:19:31 +00:00
Wez Furlong 5ee65bd8f5 Phase 1 of wrapper OO cleanup.
# Collecting underpants
2002-03-24 18:05:49 +00:00
Sander Roobol 68b18b05fe Fix typo in proto. 2002-03-24 18:01:41 +00:00
Derick Rethans a9439b7072 - Fix proto 2002-03-24 17:59:39 +00:00
Georg Richter c47244cd8a changed prototype for mysql_real_escape_string 2002-03-24 17:57:32 +00:00
Mark L. Woodward 4211c9fed2 Added support for session manager ID creation, works with patch submitted earlier 2002-03-24 17:54:19 +00:00
Zak Greant fa4bd7ab32 Added mysql_ping() function. 2002-03-24 17:34:20 +00:00
Georg Richter e15bb45a1e a) ws fixed
b) changed mysql_list_processes, mysql_stat (zend_parse_parameters)
c) New functions:
	1) mysql_real_escape_string	this function is similar to mysql_escape_string (deprecated).
					it needs a mysql-connection to escape a string according to the
					current character set

	2) mysql_character_set_name	returns the current character set for the connection

	3) mysql_thread_id		return the pid for the current connection. This function is usefull
					when using mysql_list_processes
2002-03-24 17:19:19 +00:00
Edin Kadribasic 62df9cf644 Override max_execution_time, setting it to unlimited. 2002-03-24 17:14:34 +00:00
Wez Furlong 89994a2032 News updates.
# This might have saved some discussions on php-dev if I had done it
# sooner :-)
2002-03-24 16:58:27 +00:00
Jan Lehnardt 04f6ec87d0 - initial checkin of basic testcases for pspell 2002-03-24 16:22:50 +00:00
Zak Greant 28de0b545e (PHP mysql_list_processes) Returns a pointer to a result set containing
information on the processes running in the
                           MySQL server.
(PHP mysql_stat) Returns a string containing information on the status
                 of the MySQL server.
@- Added two new functions: mysql_list_processes and mysql_stat (Georg)
@- mysql_list_processes() fetches information on the processes running on
@  the MySQL server.
@- mysql_stat() returns status information for a MySQL server.
#  Committed for Georg by Zak
2002-03-24 10:57:40 +00:00
Derick Rethans 66e510f60a - Fix for bug #16232 (Patch by Alan Knowles <alan@akbkhome.com>) 2002-03-24 10:40:21 +00:00
Stig Bakken 365505daed * move logic to _assertStateDir 2002-03-24 01:52:38 +00:00
a927404520 ChangeLog update 2002-03-24 01:18:49 +00:00
Sterling Hughes dc81ee82a1 revert out accidental code 2002-03-23 23:47:53 +00:00
Edin Kadribasic 9ecec88998 Documented -r and added TODO 2002-03-23 23:47:10 +00:00
Sterling Hughes 6270efc5a9 remove experimental status 2002-03-23 23:46:04 +00:00
Sterling Hughes 34ba10b98b the point can be made both ways :) 2002-03-23 23:40:19 +00:00
Sterling Hughes 496c46c3f0 make key identifiers case sensitive 2002-03-23 23:37:17 +00:00
Derick Rethans 60f20cd870 - Fix experimental notice 2002-03-23 23:30:17 +00:00
Jan Lehnardt 8897845f3b - fix "xml_parse_into_struct/umlauts in tags" testcase. It never really
- worked
2002-03-23 23:24:48 +00:00
Derick Rethans 1f9b519c55 - Remove read_uploaded_file 2002-03-23 23:03:04 +00:00
Edin Kadribasic 0f79e17942 .cvsignore in tests dirs cleanup 2002-03-23 22:24:32 +00:00
jim winstead 23d2eff94d remove inappropriate article 2002-03-23 18:40:24 +00:00
jim winstead c06307e8bb rewrite history a bit. there is no is_enum(), it was com_isenum(). 2002-03-23 18:37:43 +00:00
Tomas V.V.Cox b217ed9711 The System class was modified to always return true or false instead
of PEAR Errors. Changed then assertStateDir() to check for false.
2002-03-23 18:36:52 +00:00
Tomas V.V.Cox 757ec9ef38 Show maintainers name in package-info and show more human friendly
column table names
2002-03-23 17:55:51 +00:00
Marcus Boerger 4df6833a79 -defined php_stream_temp_new() for standard temp streams 2002-03-23 17:51:20 +00:00
Tomas V.V.Cox 1cf543c34a Yet another break; forgotten 2002-03-23 17:46:51 +00:00
Tomas V.V.Cox fdce319634 Oops, forgot the break; 2002-03-23 17:44:48 +00:00
Tomas V.V.Cox 8ea9125840 - Show the real dir where files would be installed (using role & config)
- Introduce column wrapping
2002-03-23 17:27:39 +00:00
Marcus Boerger 4cab908a78 -removed -x
-no german in NEWS
2002-03-23 17:22:41 +00:00
Marcus Boerger fdf9d3502a -removed -x
-error handling for illegal switch combinations
-corrected ws for one case block
2002-03-23 17:10:31 +00:00
Tomas V.V.Cox f40007a1ef - Use getenv('TERM') instead of $_ENV (empty for me in 4.1.1)
- Added 'linux' as bold capable list of term types
- Pass the col by reference for making the wrap take effect in tableRow
2002-03-23 16:50:43 +00:00
Tomas V.V.Cox dc17bcc6ab fix parse error 2002-03-23 15:56:14 +00:00
Hartmut Holzgraefe e40ce9963e dl is now aware of modules compiled for php <4.1.0
which have a slightly different module_entry structure
2002-03-23 15:37:27 +00:00
Derick Rethans e2f110d982 - Added read_uploaded_file (patch by Andrew Sitnikov <sitnikov@infonet.ee>) 2002-03-23 14:10:57 +00:00
Sebastian Bergmann bfa05df3fd Nuke unused variables. 2002-03-23 13:13:15 +00:00
Andi Gutmans 3e3ae4f61c - Fix build without ZTS. If someone has a nicer fix let me know. 2002-03-23 12:18:50 +00:00
Stig Bakken 3402d342a6 * added package-list and package-info commands (for .tgz files) 2002-03-23 10:21:29 +00:00
Stig Bakken 9fae289542 * use switch/case for what it's worth :-) 2002-03-23 10:20:41 +00:00
Stig Bakken b5604d18dc * _lock() calls _assertStateDir() 2002-03-23 10:18:32 +00:00
Stig Bakken ed16ccb275 * support having a toplevel package.xml in tgz files 2002-03-23 10:17:39 +00:00
Stig Bakken e965aba2aa * wordwrapping and multiline table cell support 2002-03-23 10:15:36 +00:00
Rui Hirokawa 751dcedb08 fixed some errors in regression tests. 2002-03-23 07:36:27 +00:00
Rui Hirokawa d1caef7155 changed license from GPL2 to PHP License. 2002-03-23 07:33:13 +00:00
Rui Hirokawa 8c09fb90ba fixed compile warnings. 2002-03-23 07:32:40 +00:00
James Cox 7d5e529b55 "reverting" to 1.39 as per Tomas Cox's wishes. 2002-03-23 05:29:09 +00:00
Yasuo Ohgaki 5f3d9a67f9 Fix test :) 2002-03-23 01:50:54 +00:00
Hartmut Holzgraefe ab928b03d6 proto fix 2002-03-23 01:43:38 +00:00
Yasuo Ohgaki 4a95a9295a Added while(list() = each()) test
# We may want tests/bugs ?
2002-03-23 01:34:50 +00:00
b8bf7c9f7f NEWS update 2002-03-23 01:19:18 +00:00
8694004ba9 ChangeLog update 2002-03-23 01:18:55 +00:00
Marcus Boerger 122c18741c @Added new switch -x to CLI that enables execution of files without @scripting tags. (Marcus)
-Add -x
#Read follow up mail
2002-03-22 15:26:27 +00:00
foobar cf267402b5 fix the fix 2002-03-22 13:55:11 +00:00
foobar 35e7255055 - Fixed minor inconvenience with iconv detection when iconv is found in libc 2002-03-22 13:49:05 +00:00
Stig Bakken 5e0f34ea55 * don't start table cells with a space in borderless tables 2002-03-22 12:47:13 +00:00
Stig Bakken 1b09d1f19c * typo fix 2002-03-22 12:46:18 +00:00
Stig Bakken 75f15860b1 * use PEAR_Frontend tables in config-show command 2002-03-22 12:45:41 +00:00
Derick Rethans fe614114e6 - oops :) 2002-03-22 12:15:40 +00:00
Derick Rethans bdf73d2972 - Fix for bug #14644 (patch by samuel_carriere@hotmail.com) 2002-03-22 12:13:59 +00:00
Stig Bakken a57a5d7eda * now using PEAR_Frontend tables 2002-03-22 11:59:52 +00:00
Stig Bakken fd62c434e5 * ncurses note 2002-03-22 11:58:22 +00:00
Stig Bakken 5cc2e77ca8 * table support working
* added bold support for xterm/vt220/vt100 terminals
2002-03-22 11:57:45 +00:00
Stig Bakken 8ce0ceb372 * setUIType -> setFrontendType 2002-03-22 11:57:09 +00:00
Hartmut Holzgraefe 0fa0ae051d manual is fixed to have static anchors generated from ids for the faq part 2002-03-22 11:19:12 +00:00
Stig Bakken 5d11204de0 * rename class/methods 2002-03-22 11:09:58 +00:00
Stig Bakken 9631885246 * temporarily added: nuke old files/dirs 2002-03-22 10:28:27 +00:00
Sascha Schumann f93e3ab954 de-overquotation 2002-03-22 10:22:41 +00:00
Sascha Schumann e4a5210bbf A cli-specific extension should be named once only, not twice.
Noticed by: Derick
2002-03-22 10:22:02 +00:00
Stig Bakken 73d26803f0 * one last CommandUI -> Frontend change 2002-03-22 10:05:40 +00:00
Stig Bakken 60035fb949 * rename PEAR_CommandUI* to PEAR_Frontend*
* rename PEAR/Command/Login.php to PEAR/Command/Auth.php
* replace PEAR/Command/Info.php with PEAR/Command/Registry.php (will contain
  more commands related to the local registry)
* started working on Frontend table output
2002-03-22 09:22:28 +00:00
Derick Rethans 141e3d52f7 - Add test for sprintf()'s zero'th argument 2002-03-22 09:09:36 +00:00
Derick Rethans 25b42ae3b6 - Fix handling of zero'th argument for sprintf()'s argument swapping code
(Patch by Morten Poulsen <morten@afdelingp.dk>)
2002-03-22 09:09:18 +00:00
Derick Rethans c7bee30374 - Add note about changed fopen wrappers 2002-03-22 08:47:41 +00:00
Stig Bakken e41dca2995 * No point in creating the lock file directory if it does not exist (so many
other things would fail anyway).  Throw an error instead.
2002-03-22 08:32:40 +00:00
2b87db1674 ChangeLog update 2002-03-22 01:20:21 +00:00
Hartmut Holzgraefe 10811cd0d8 getting rid of the warn_not_available alias 2002-03-22 01:10:31 +00:00
Markus Fischer b199615ed2 - Fix #16206. 2002-03-21 23:12:10 +00:00
Markus Fischer 1d75089d8b *** empty log message *** 2002-03-21 22:35:02 +00:00
Tomas V.V.Cox 9772468d37 - Make the rellocation of packages work as expected if the target
dir doesn't exist
- The "install -f" now replaces the info in the registry
2002-03-21 22:29:03 +00:00
Markus Fischer 341af63328 - Use proper macros for php_stream_cast() return values (fixes #16211). 2002-03-21 22:05:40 +00:00
foobar 9ef9a18d2c The changes to build system and the streams stuff alone are big enough
reason to make next release 4.3.0
2002-03-21 20:55:55 +00:00
Tomas V.V.Cox 41a8a27676 - Added command level options
- Fix error handling for Getopt (it doesn't use raiseError)
2002-03-21 20:55:41 +00:00
Tomas V.V.Cox a7936eea78 - Implement command level options
- Removed call pass by reference
- Readd $options to command::run() params
2002-03-21 20:52:26 +00:00
Marcus Boerger 661fd669ec -missing efree in close 2002-03-21 20:37:04 +00:00
foobar 4110878a24 This file is generated and not supposed to be in CVS 2002-03-21 20:25:01 +00:00
foobar b5707cefc1 missing file 2002-03-21 20:22:41 +00:00
foobar d533371760 - Fixed bug #16165 again. We check libc for iconv functions only if
no path is given for --with-iconv.
# I hope this is the last time.
2002-03-21 20:22:05 +00:00
Marcus Boerger eb8c6b4696 -removed old streams test code 2002-03-21 20:16:22 +00:00
foobar 5b495616bd This file was missing. 2002-03-21 20:10:24 +00:00
Marcus Boerger ac6ae669e4 -fixed memory handling 2002-03-21 19:59:08 +00:00
Hartmut Holzgraefe b00d9a5b2c added fnmatch() and glob() functions
could someone please check if i got the virtual dir stuff right?
2002-03-21 19:18:13 +00:00
Tomas V.V.Cox a974fbd9ae fix a problem handling nested directories 2002-03-21 19:12:49 +00:00
Sascha Schumann a188fac946 Support systems without NIS functions, but with non-working libnsl 2002-03-21 17:05:47 +00:00
Wez Furlong 06f6e47e4c Require that wrappers use <protocol>://<path> to avoid
ambiguities when filenames have ':' characters.
This slightly breaks BC with the old style zlib: wrapper.
2002-03-21 17:02:50 +00:00
Hartmut Holzgraefe 8c0fd5bc35 proto fixes 2002-03-21 16:10:08 +00:00
foobar ec1b89a627 Minor detail fixed. 2002-03-21 15:49:55 +00:00
Andrei Zmievski 1cf188ae1b Fix compilation when PCRE is disabled. 2002-03-21 15:28:46 +00:00
Sander Roobol a15c9a31eb Added tests for pow()'ing with broken exponents and some additional test
for count()'ing arrays.
2002-03-21 14:18:30 +00:00
Wez Furlong abb7905c0c NEWS updates 2002-03-21 14:08:59 +00:00
Rui Hirokawa 4e494746c1 fixed POST/GET input processing. 2002-03-21 13:44:39 +00:00
Marcus Boerger 671829bff4 #ws 2002-03-21 13:16:03 +00:00
Marcus Boerger f2ae5b70d9 #uups commit on wrong file 2002-03-21 12:55:37 +00:00
Marcus Boerger a598e0b73f -fix missing efree 2002-03-21 12:45:32 +00:00
Tomas V.V.Cox 9bee3510ea readd the "list" command 2002-03-21 11:33:54 +00:00
Tomas V.V.Cox b14c8152da Adapt this commands to the new config store mechanism and command params 2002-03-21 11:16:15 +00:00
Tomas V.V.Cox 139f69ca32 Pass config to command factory and pass the correct command params 2002-03-21 11:13:02 +00:00
Tomas V.V.Cox 47c71bcaa1 - The config object is stored by the factory method
- Make install/unistall/package work again (didn't work for me)
2002-03-21 11:10:17 +00:00
Tomas V.V.Cox 67b971aece Clean up unused stuff 2002-03-21 11:04:56 +00:00
Sebastian Bergmann f6102f7300 ext/overload is a 'built-in' extension on Win32. 2002-03-21 06:25:42 +00:00
Andi Gutmans e7100e22dc - No idea how this slipped in. Fix delete $obj statement. 2002-03-21 04:20:03 +00:00
Wez Furlong c0e39dfa9c Implement bz2 streams and bz2: wrapper.
You can now do this:
copy("zlib:src.gz", "bz2:dest.bz2");
As with zlib, most of the functions with counterparts
in file.c are now aliases to those functions.
2002-03-21 02:27:41 +00:00
Wez Furlong 8da0093935 really nuke it... 2002-03-21 01:22:36 +00:00
ba81ebf46c ChangeLog update 2002-03-21 01:19:29 +00:00
Wez Furlong a662f012bb Convert the gzfile related functions into aliases for their equivalents
in ext/standard/file.c, so a gzopen()ed file pointer can be used in
fread, fseek etc.
Improved behaviour of zlib stream.
Moved passthru code into streams.c
# I'm not happy about BG(mmap_file)
Nuked gzgetss_state as no longer needed.
2002-03-21 01:11:52 +00:00
Yasuo Ohgaki 4094513915 Show function name in error message. 2002-03-21 00:06:45 +00:00
Harald Radi d5e64b2287 added thread safe hashtable which allows concurrent
reads but only exclusive writes
2002-03-20 21:26:46 +00:00
Boian Bonev 4586665c19 ws fix 2002-03-20 19:45:25 +00:00
Boian Bonev e94ffe37e7 fix version checking - now handle 1.2.3 and 1.2 as well 2002-03-20 19:22:54 +00:00
Harald Radi f64628eb7d fixed signed/unsigned comparison warnings 2002-03-20 19:13:03 +00:00
Derick Rethans 85682d568f - Fix makedist 2002-03-20 18:54:30 +00:00
Sander Roobol 8581f8394b Some PHP-info layout fixes (\n will automatically be converted into <br />)
and a comment-related fix.
2002-03-20 18:29:28 +00:00
Boian Bonev 396dc67cf7 fix a missing [ 2002-03-20 18:22:32 +00:00
foobar 9a5b42cb78 - Should work better now.. 2002-03-20 18:16:51 +00:00
Wez Furlong 3dbde95896 Make state parameter of php_strip_tags passed by reference.
Move state tracking to stream structure.
2002-03-20 14:38:13 +00:00
Wez Furlong 659a071e3d Streams are all tracked as resources now.
Add some logic that will help track down leaks
when debug is enabled.
2002-03-20 14:21:30 +00:00
Wez Furlong 14d62c7b62 Add parameter here too... 2002-03-20 13:50:16 +00:00
Sascha Schumann 350de12bc2 Expand the variables in PHP_EXPAND_BUILD_VARS.
Make HAVE_ICONV/HAVE_LIBICONV available through the more
fine-grained approach using a single include file per
directive.  This will significantly reduce the price of
full dependencies for developers, because basically each
file today includes php.h which includes php_config.h.

If PHP_ATOM_INC is defined, these include files can be used.

For all PHP_DEFINEs, empty files are created upon configure start.
2002-03-20 13:24:59 +00:00
Wez Furlong 6f77640ca8 add forgotten parameter 2002-03-20 13:21:55 +00:00
Sascha Schumann c8ec0fa4bd Fix building mysql client library
Run client lib specific checks only when clientlib is used
Remove second invocation of MYSQL_SOCK
2002-03-20 12:40:27 +00:00
Sascha Schumann 1962e1e620 Avoid duplicate tests and make third parameter truly optional. 2002-03-20 12:08:30 +00:00
foobar 4597486984 - Fixed (hope so :) like Sascha said. 2002-03-20 12:00:26 +00:00
Sascha Schumann 71a361d5ea Fix and tweak iconv macro 2002-03-20 11:59:48 +00:00
Sascha Schumann d9f36aed9f Don't quote too much. Now autoconf-2.13 is happy again. 2002-03-20 11:49:36 +00:00
Sascha Schumann 5005415595 Remove autoconf-2.5x specific m4_default macro.
It is pointless here, because we don't need any "void" statement.
There already is a statement and all it will do in the worst case
is generate an empty line
2002-03-20 11:41:06 +00:00
Sascha Schumann 6bbf968f8a There should not be any trailing data on an #endif line 2002-03-20 08:53:55 +00:00
Sascha Schumann 171b8642dc add info about build system macros 2002-03-20 08:48:41 +00:00
Markus Fischer f130bdb59e - Fix for #16176. 2002-03-20 08:17:06 +00:00
Jon Parise bb82bf2e2b This completely fixes the iconv library detection under FreeBSD (the
previous fix was incomplete).  We also set HAVE_ICONV and HAVE_LIBICONV
based on the library that was detected.
2002-03-20 07:36:56 +00:00
foobar 9ccad4a8ba - Fixed the bz2 tests. (and changed the usage comment to be correct) 2002-03-20 02:16:34 +00:00
foobar 956a7762b8 - This is not needed here 2002-03-20 02:07:32 +00:00
foobar 4a0291d238 - Make it possible to build ext/openssl as shared extension 2002-03-20 02:07:11 +00:00
foobar 00929ff9ac - Fixed bug: #16139 (compile failure with Mysql 4.0.1)
- Some tests were only run when compiling with the bundled libs.
  (caused some compile warnings with external mysql libs)
- Another try to fix the zlib issue..(uncompress)
2002-03-20 01:31:22 +00:00
92adc9456a ChangeLog update 2002-03-20 01:21:12 +00:00
foobar e8271cc71e - Fix this without breaking BC 2002-03-20 00:39:28 +00:00
Wez Furlong 7990d742e5 Improve behaviour of the stream casting operation.
Improve interaction with fopencookie.
2002-03-19 23:29:37 +00:00
Harald Radi 2adf5bea7c pass function signature in zend_parse_parameters style
lookup cache works now per signature (not only method name)
reviewed resource management
# have to learn now ..
2002-03-19 23:28:52 +00:00
Frank M. Kromann f6ec73d37f Minor change to allocated lengths for dates 2002-03-19 23:00:17 +00:00
foobar 1822154a4c missing entry 2002-03-19 22:52:27 +00:00
Markus Fischer 7bf57c999c - Support vpopmail 5.2 (fixes #16120). 2002-03-19 22:47:37 +00:00
foobar a62b31f6b7 - Fix the iconv detection when the functions are prefixed with lib.
(e.g. in freebsd)
2002-03-19 22:40:18 +00:00
Frank M. Kromann 42ba9987ea Oops.. This should make I64 work on WIn32 as well 2002-03-19 22:38:35 +00:00
Frank M. Kromann 0201386fac Changing the LongInteger to return 64 bit integers as string values with all 64 bit 2002-03-19 22:36:42 +00:00
Markus Fischer cd0ceca76f - Fix bug spotted by Lukas Schroeder <lukas@edeal.de>. 2002-03-19 21:18:18 +00:00
Stig Bakken c19ddade2c * install PEAR_Command_Package 2002-03-19 19:59:05 +00:00
Stig Bakken de381091ba * re-add "package" command 2002-03-19 19:55:30 +00:00
Stig Bakken fdf8cafd11 * "pear login" finally works 2002-03-19 19:31:02 +00:00
Stig Bakken 97beb58d43 * fix http auth bug 2002-03-19 19:30:06 +00:00
Stig Bakken 529ec7cda4 * add optional default parameter to userDialog method 2002-03-19 19:28:48 +00:00
Zeev Suraski a9411a6da2 Possibly fix a crash - Marcus, please take a look at it... 2002-03-19 19:16:20 +00:00
Zeev Suraski dcb44bf512 - Fix whitespace (guys, please try to stick with the php4 tree style as far
as indentation/newlines go, and also as far as using {} even on if's
  that have single statements)
- Fix Windows build
2002-03-19 19:15:40 +00:00
Andi Gutmans a990c4da3e - Finish covering all parsed methods to check for validity in parser.
- Change zval's refcount to zend_uint (If it doesn't slow down the Engine
- too much it should probably stay this way). If anyone has time to test
- the difference in speed between zend_ushort & zend_uint in zend.h of
- the struct _zval_struct (one line change) I'd be glad to get some
- figures.
2002-03-19 19:09:53 +00:00
Harald Radi cb2368c905 fixed memleaks
added method lookup caching
pass function signature to hash function callback
2002-03-19 18:46:28 +00:00
Frank M. Kromann 5280936895 Adding support for TinyInteger and LongInteger database types 2002-03-19 18:33:05 +00:00
Wez Furlong 14a3911866 fix for bug #16168 2002-03-19 17:49:02 +00:00
Wez Furlong b92f2da5fa make buffer length warnings more verbose 2002-03-19 16:56:53 +00:00
Ludovico Magnocavallo 6ebf422685 Fixed include of interbase.inc
Fixed test database path
Changed v_date field in test table definition to timestamp type
Reduced maximum length of double precision type to 18

Tests 001 002 003 006 pass
Test 004 (BLOB test) still needs to be fixed
Test 005 (Transaction) gives the right output but issues a warning
2002-03-19 16:52:41 +00:00
Daniela Mariaschi c3daa18168 fixed floating number incorrectly rendered (as mentioned by giancarlo@niccolai.ws in BUG #14755) 2002-03-19 15:29:17 +00:00
Wez Furlong 32a4f35580 register some constants for user streams 2002-03-19 14:35:55 +00:00
Uwe Steinmann 17b2eb13cc - the fdf include file shipped with the FDF toolkit is spelled
in lower case (at least in version 5.0)
2002-03-19 14:03:30 +00:00
Wez Furlong 6d55f16974 correct copy/paste typo 2002-03-19 13:46:32 +00:00
Wez Furlong 6d431f1caf avoid possible buffer overruns when write returns a value larger than the buffer 2002-03-19 13:44:38 +00:00
Wez Furlong b808af8601 Make file_get_wrapper_data return the underlying PHP object for
user-space streams.
2002-03-19 13:42:25 +00:00
Wez Furlong 6abe71bebc s/fgetwrapperdata/file_get_wrapper_data/ 2002-03-19 13:33:07 +00:00
Sascha Schumann 3757a81367 Remove trailing ;
The macro can now safely be used in constructs such as

if (..) foo() else bar();
2002-03-19 12:11:46 +00:00
Sascha Schumann 0459ad70a7 some typo fixing, and following The Little Book, omitting needless words 2002-03-19 12:08:57 +00:00
Sascha Schumann 27bf1db90b Somewhere along the build changes, -export-dynamic was lost.
Readd it.

Noticed by: Stanislav Malyshev
2002-03-19 11:48:40 +00:00
Sascha Schumann f84167571f touch file. Please commit first the .re file and afterwards the .c source. Otherwise, timestamps will be broken. 2002-03-19 11:39:41 +00:00
Thies C. Arntzen 3550d75d0f fix #12793 - serialize will now spit a notice if the return value of __sleep is
bogus.
2002-03-19 11:25:21 +00:00
foobar 737ea7691a added missing .libs entry 2002-03-19 10:52:41 +00:00
foobar 2bdd6f522e - Not needed anymore. 2002-03-19 10:49:26 +00:00
Yasuo Ohgaki 69d6f1e3f5 Added README.SUBMITTING_PATCH file. Please fix/add/change.
Added more description for use of assert().
2002-03-19 09:13:45 +00:00
Sebastian Bergmann 239a05eef6 Add streams.c/user_streams.c to MSVC projects. 2002-03-19 07:01:30 +00:00
Wez Furlong 06712a508a Implement user-space streams.
There's probably room for improvement,
docs will following some time this week.
2002-03-19 03:51:01 +00:00
Wez Furlong 9e14ed0255 add sys/poll.h header detection 2002-03-19 03:49:26 +00:00
Wez Furlong 67231e25e4 make feof more useful on network streams 2002-03-19 03:49:03 +00:00
Harald Radi a85ea38eac added lookup caching and now make use of the new thread
safe hashtables (not in cvs right now)
2002-03-19 03:36:16 +00:00
Yasuo Ohgaki 68f63a012f WS fix 2002-03-19 02:59:15 +00:00
c7b7b5a9b1 ChangeLog update 2002-03-19 01:22:04 +00:00
Jon Parise aceb7a3c2e Give one last reference to pear-get. 2002-03-19 01:19:24 +00:00
Stig Bakken 623905dfbf * pear-get gone 2002-03-19 01:13:20 +00:00
Vlad Krupin 7139845af9 Fix ftp_size() returning bogus results.
# make sure the server is in BINARY mode before requesting file size.
2002-03-18 22:26:32 +00:00
Sebastian Bergmann 46315144ee Fugbix typo. 2002-03-18 22:13:14 +00:00
Frank M. Kromann 836c6e36aa Adding note about permission to distribute this code under the PHP license 2002-03-18 21:38:17 +00:00
Frank M. Kromann ce24409e86 Adding HAVE_SHUTDOWN on win32. Needed for the sockets extension to compile 2002-03-18 21:09:23 +00:00
Markus Fischer 30454e237b - Let OCIError() also return the sql statement which failed and the exact
position into the statement where it failed (if applicable).
  Patch by Daniel Ceregatti <vi@sh.nu>.
2002-03-18 21:01:29 +00:00
Wez Furlong e3a884f552 fix error message which appeared even if no ssl mode was selected 2002-03-18 20:44:15 +00:00
Andi Gutmans c5ad6ae1b8 - More fixes to check for member/function call legality. 2002-03-18 20:27:03 +00:00
Wez Furlong 33906e934a Fix for bug #10001: a timeout event prevents further reads.
The Bug DB has a patch that should be applied to fsock.c on the
4.2 branch.
2002-03-18 20:13:50 +00:00
Zeev Suraski 16c9da0eed Fix build under Release_TS
Maybe separating TSRMLS away wasn't such a good idea (sorry Wez :)
2002-03-18 19:47:50 +00:00
Wez Furlong 48e902bacd Fix for bugs #16148, #11199, #10092:
fread from socket will never free memory.
This patch should also be applied to php_sockread_internal in
fsock.c in the 4.2 branch.
2002-03-18 19:42:19 +00:00
Wez Furlong c978602a0b fix non-TS build... 2002-03-18 19:13:11 +00:00
Wez Furlong 021bf6f01f Shouldn't have made it into my last commit. 2002-03-18 18:57:25 +00:00
Wez Furlong c9d5e13738 TSRMLS related work on streams, as discussed with Zeev.
# Should be the last "broad" commit for a while
# Don't forget to make clean ; make
2002-03-18 18:54:32 +00:00
Stig Bakken 41c1c08495 * get rid of this hack 2002-03-18 18:01:14 +00:00
Hartmut Holzgraefe c19dfe84c7 proto fixes 2002-03-18 18:00:24 +00:00
Stig Bakken a036fe5b72 * Refactoring of "pear" command internals. Highlights:
- user interface abstraction, making a Gtk installer should only be
   a matter of implementing PEAR_CommandUI_Gtk plus a "pear-gtk" executable
 - separated code into command classes, able to specify one or more
   commands
 - no more "pear-get" :-)
* fixed use of PEAR_Config::singleton to avoid object copying
2002-03-18 17:39:52 +00:00
Edin Kadribasic 4609e926cf -r is in the release branch. 2002-03-18 15:11:41 +00:00
Sascha Schumann 26a92a72f1 unused makefile.in 2002-03-18 14:38:01 +00:00
Sascha Schumann 94a3c1e7a4 empty files, let them go 2002-03-18 14:37:22 +00:00
Wez Furlong 5fb9f9c134 fix warning 2002-03-18 11:49:40 +00:00
Wez Furlong 966784bcde fix TSRM build 2002-03-18 11:46:21 +00:00
Wez Furlong 8ba2514253 Fix build.
Warning about TSRM testing still applies.
2002-03-18 11:46:00 +00:00
Wez Furlong dd9a3c94a8 tidyup use of STREAMS_DC macros 2002-03-18 11:18:07 +00:00
Wez Furlong 1222d80860 having streams is now the default 2002-03-18 10:44:39 +00:00
Zeev Suraski c157b0f75b Move stream files into the right folders 2002-03-18 10:35:01 +00:00
Stanislav Malyshev 834042f56d Update .dsp 2002-03-18 09:47:24 +00:00
Stanislav Malyshev 858291e6b5 Fix build 2002-03-18 09:42:20 +00:00
Zeev Suraski a145646e74 Fix build 2002-03-18 09:20:43 +00:00
Zeev Suraski 8cb649d06d Make Sebastian happy 2002-03-18 09:12:31 +00:00
Sascha Schumann 68d2592f52 Rename HAVE_PHP_STREAM to PHP_HAVE_STREAMS, because
1.) a PHP-specific symbol should be in the php namespace, and
2.) there are multiple streams and the old configure parameter was plural, too.
2002-03-18 08:29:17 +00:00
Sascha Schumann d74666a648 touch file 2002-03-18 08:22:33 +00:00
Zeev Suraski 73e79322ba Fix the build and all of the outstanding VC++ warnings 2002-03-18 08:05:28 +00:00
Yasuo Ohgaki 3de2e94c84 -c option is for path. 2002-03-18 06:06:00 +00:00
Yasuo Ohgaki 9d2edd0fd8 Use common.inc instead of common.php for ease of use (rm -f *.php for failed
test files)
2002-03-18 06:03:53 +00:00
Marcus Boerger 68f4e7c328 -streams are no longer an option 2002-03-18 05:32:25 +00:00
Marcus Boerger f83c6cc0a9 -temp streams are now clean (Thanks to Wez) 2002-03-18 04:57:06 +00:00
Shane Caraveo 391fdf858e add new ini item for fastcgi 2002-03-18 04:49:16 +00:00
Shane Caraveo c806dca62c add security impersonation feature for running under IIS security 2002-03-18 04:48:34 +00:00
Shane Caraveo b84c61f314 Add impersonation feature for running under IIS 2002-03-18 04:46:32 +00:00
jim winstead c91474615c make test: '-c' flag doesn't work like this expects (it takes a
directory, not a file), and this isn't necessary.
2002-03-18 03:51:40 +00:00
jim winstead 349936c93e Fix calculation of output buffer size in wordwrap(). (Thanks to Wez.) 2002-03-18 02:00:57 +00:00
Wez Furlong dc8593cb7b correct grammar 2002-03-18 01:40:56 +00:00
67d75b177d ChangeLog update 2002-03-18 01:21:55 +00:00
Wez Furlong afd2c5662a Add some rules for stream implementors. 2002-03-18 01:12:32 +00:00
Marcus Boerger c645babd8a -use php_stream_make_seekable 2002-03-18 00:12:47 +00:00
Marcus Boerger 318dc3e527 -added temporary streams
-added stream debug code
#should be used from php_stream_make_seekable
2002-03-17 23:50:31 +00:00
Wez Furlong d2d8762267 Streams now make more use of the memory manager, so tracking down
leaking streams should be easier.
# I hate these big commits
2002-03-17 22:50:59 +00:00
foobar 19e82a49f9 - Made one test/setup macro for iconv and fixed it to check
for libc first.
2002-03-17 21:09:21 +00:00
Stefan Esser 0d3a45299d SAFE_MODE restriction error message fixed if the file doesn't exist 2002-03-17 21:00:44 +00:00
Stefan Esser cce45de17c move_uploaded_files checks open_basedir now 2002-03-17 20:56:20 +00:00
Jason Greene aab103e9fc Remove already included file 2002-03-17 19:41:24 +00:00
Andi Gutmans 46afe61d25 - Start putting error handling where method calls are being used in a
- context where only writable variables should be used.
2002-03-17 19:13:46 +00:00
foobar d568b5c87b Fix build. 2002-03-17 17:30:55 +00:00
Sander Roobol 9ca0100889 Fixed compile error about gdImageColorResolve (#14426, #15000). 2002-03-17 17:01:18 +00:00
Harald Radi 65c4e9e0fd removed anoying warnings 2002-03-17 16:45:56 +00:00
Harald Radi 2b7c7de500 reduced warninglevel to remove the annoying
warnings from the re2c generated code
2002-03-17 16:20:50 +00:00
James Cox 7859852a3c NEWS is my friend... 2002-03-17 16:04:35 +00:00
James Cox 90fe0e93e9 s/-/ ./ 2002-03-17 15:49:53 +00:00
James Cox d0bfa92b42 no, really update it 2002-03-17 15:27:51 +00:00
foobar fdc07402b5 - This is not used anymore. 2002-03-17 15:17:46 +00:00
James Cox 2aa84cd9f5 updated NEWS 2002-03-17 15:12:18 +00:00
Wez Furlong 12a0092376 Fix for php_stream_gets when the implementation does not support it
natively (Thanks Marcus).

Implement php_stream_make_seekable() and add STREAM_MUST_SEEK as an
option to php_stream_open_wrapper().
See README.STREAMS for usage.
2002-03-17 14:21:01 +00:00
Wez Furlong effa6e8daa tidy up the headers (streams related) 2002-03-17 13:29:44 +00:00
Wez Furlong 436e339bc7 Fix for Bug #16121: make unix socket names binary safe.
# Could be applied to 4.2 branch, but I don't have a working copy, and
# I don't think it's amazingly critical.
2002-03-17 13:19:27 +00:00
Wez Furlong b98074ee86 fix problems with cgi/cli sapi when running tests 2002-03-17 13:16:35 +00:00
Marcus Boerger 20f2e63289 #removed code to track down error in streams 2002-03-17 12:16:29 +00:00
Marcus Boerger 34cb24fcf7 -fix bug with wrappers 2002-03-17 12:06:41 +00:00
Markus Fischer 519e6b2208 - Let configure also detect installation in standard unix paths.
- Properly format error message.
2002-03-17 08:33:25 +00:00
Shane Caraveo 4a8dda7d01 fix closing pipes
fix buffer overrun
2002-03-17 08:21:18 +00:00
Markus Fischer bfbb3bba1f - Fix some compiler warnings and errors. 2002-03-17 08:10:04 +00:00
Wez Furlong 1d3ad85ac2 fix win32 warning and ming leak 2002-03-17 01:58:42 +00:00
8261132f41 NEWS update 2002-03-17 01:20:41 +00:00
e0fd7cc2da ChangeLog update 2002-03-17 01:19:36 +00:00
Stig Bakken c55f61c9aa * added optional layer parameter to get() method
* added isDefinedLayer() method
2002-03-16 23:48:23 +00:00
Markus Fischer 9a6296c47e - WS and code style fix. 2002-03-16 22:31:57 +00:00
foobar 6f546e7b42 - Fixed some typos. 2002-03-16 22:19:33 +00:00
Markus Fischer 6c27722398 - Some more TSRMLS fixes. 2002-03-16 22:19:10 +00:00
Harald Radi 2be6527fc6 fixed TSRM build 2002-03-16 22:08:23 +00:00
Marcus Boerger bcad7a593a -quick hack to bug in streams....but where? 2002-03-16 21:19:17 +00:00
Marcus Boerger d50102b6ab -disabling debug
#Wez: i have an error when closing the original file after stream copy...
2002-03-16 20:25:51 +00:00
Marcus Boerger f24caf3244 -formatting 2002-03-16 20:12:58 +00:00
Marcus Boerger fe9cb020ae -fix bug for not correct terminated comments
-switch to streams
@exif functions now support streams using memory streams where @necessary (marcus)
2002-03-16 20:12:17 +00:00
Marcus Boerger 8c3535e15a -added memory streams
@added memory streams (marcus)
2002-03-16 20:11:06 +00:00
Marcus Boerger bfe7a9acaf -copy_stream_to_stream returns size if maxlen == PHP_STREAM_COPY_ALL
#had to commit myself to do the rest...
2002-03-16 20:05:08 +00:00
Wez Furlong b28e19c004 fix ftell/fseek in stdio streams 2002-03-16 18:52:03 +00:00
Wez Furlong b85096ffe9 fix build problem for interbase 2002-03-16 18:43:41 +00:00
Wez Furlong 5d0c53eecf Fix some issues with gzFile and fsockopen. 2002-03-16 18:42:42 +00:00
Andi Gutmans a18000f163 - Indentation fix.
Never do:
if (expr) {
}
else

It should be:
if (expr) {
} else {
2002-03-16 18:16:55 +00:00
Wez Furlong 1fdd2a7ddd add HAVE_PHP_STREAM macro for extensions to test which fileio functions to use 2002-03-16 17:54:11 +00:00
Wez Furlong 0895998bef s/get_file_contents/file_get_contents/ 2002-03-16 16:52:24 +00:00
Harald Radi 11a67831d1 blah 2002-03-16 16:15:34 +00:00
Wez Furlong 201446c2b5 Ooops. 2002-03-16 16:14:56 +00:00
Wez Furlong 0447327118 Implement get_file_contents() as discussed (briefly!) by myself, Derick
and Sterling on php-dev some months ago.
It returns the file contents as a string, and uses mmap if possible.
2002-03-16 16:06:18 +00:00
Markus Fischer ac50b53018 - WS fix. 2002-03-16 15:50:20 +00:00
Markus Fischer 3c52ef676f - Don't forget to close the handle. 2002-03-16 15:42:34 +00:00
Wez Furlong 80f52730ff correct some problems with ming 2002-03-16 15:15:51 +00:00
Wez Furlong bed04279c3 Hopefully fix resource usage so that we have no leaks and don't segfault. 2002-03-16 14:39:51 +00:00
Wez Furlong 6abd7c6f93 fix typo 2002-03-16 13:54:03 +00:00
Wez Furlong 6beb1e37a8 work around apache segfault for the moment 2002-03-16 13:50:17 +00:00
Wez Furlong 30647934a4 Tweak the API to be more consistent.
Update docs.
2002-03-16 13:48:57 +00:00
Markus Fischer d4e63bc5bf - Raise warning when trying to execute non-executeable shell
for mail delivery binary.
2002-03-16 12:45:43 +00:00
Harald Radi 01e5d78b80 TSRM fix 2002-03-16 12:22:25 +00:00
Wez Furlong 12f893d142 fsock.c did it this way, so it must be OK... 2002-03-16 12:07:27 +00:00
Wez Furlong a411b0e97b bring back ptrdiff_t 2002-03-16 11:58:38 +00:00
Wez Furlong 31ed1707a1 Hopefully fix probs with apache. 2002-03-16 11:24:12 +00:00
Wez Furlong e0fc29877f update NEWS 2002-03-16 11:12:25 +00:00
Sander Roobol ae69dae6f8 Fixed build with multiple concurrent jobs: zend_indent.c, zend_highlight.c
and zend_compile.c require zend_language_parser.h
2002-03-16 11:02:35 +00:00
Stefan Esser e926db7bfa fixed possible bufferoverflow in get_next_char
malformed input to htmlentities/htmlspecialchars
with utf-8 encoding crashed the server

ex: htmlentities("\xfd...(30times)", ENT_NOQUOTES, "utf-8");
2002-03-16 09:44:30 +00:00
Andi Gutmans 1d2ff695e9 - Add streams.c and php_streams.h to project. 2002-03-16 08:11:52 +00:00
Rui Hirokawa 9a735efbce fixed some errors of mbstring in regression tests. 2002-03-16 07:33:21 +00:00
foobar fe976659fd - Do not use @ when you're merging the fixes to the release branch.
Instead, edit the NEWS file manually.
2002-03-16 05:43:04 +00:00
Wez Furlong 29cb19ad18 some minor docu-in-header changes 2002-03-16 03:50:17 +00:00
Yasuo Ohgaki 31fe5e46cb Quick fix build error when ptrdiff_t is not defined in types.h or sys/types.h 2002-03-16 03:37:11 +00:00
Yasuo Ohgaki 2d08c867c8 ZTS build fix 2002-03-16 03:33:48 +00:00
Yasuo Ohgaki 115a0be944 ZTS build fix 2002-03-16 03:30:19 +00:00
Wez Furlong 636829345e Allow php_stream_copy_to_stream to do nothing when used with code
that calculates a max length of zero. (Thanks again Marcus).
2002-03-16 02:48:35 +00:00
Marcus Boerger 94b6c6e87f -use of corrected stream seek
#thanks to Wez!
#image.c no works again
2002-03-16 02:46:04 +00:00
Wez Furlong 7da30fa08c some tweaks for seek/read used in image.c (thanks Marcus) 2002-03-16 02:39:39 +00:00
Wez Furlong 52982c422e This should help with some build problems/warnings under win32.
Someone still needs to add the streams.c file to the MSVC
project/workspace though (there are so many that I don't really know
what I am doing :-).
2002-03-16 02:33:00 +00:00
Marcus Boerger 59ba0b5172 -new streams 2002-03-16 02:23:57 +00:00
Wez Furlong 28d6981152 more *'s 2002-03-16 01:58:13 +00:00
Wez Furlong bc264db921 change * formatting 2002-03-16 01:37:24 +00:00
Wez Furlong a184f5d1d3 * formatting, plus remove some old fopen wrappers 2002-03-16 01:34:52 +00:00
Wez Furlong 09213d7bf8 change * formatting 2002-03-16 01:28:57 +00:00
a1667db82d NEWS update 2002-03-16 01:19:21 +00:00
801b8f4340 ChangeLog update 2002-03-16 01:19:01 +00:00
jim winstead d3400b2b5f the 'setup' script was removed more than two years ago.
these can be safely removed from the 4.2 branch, too.
2002-03-16 00:21:40 +00:00
Andi Gutmans 8dfe4961c4 - More whitespace. I really can't do the other files though... 2002-03-16 00:13:46 +00:00
Andi Gutmans f1e0b83277 - Change one strncpy() to strlcpy().
- Big indentation patch. I don't have strength to do all of the changed
- files but here's a good example. Please try and keep to the coding
- standards even if you think they suck :)
- Things to keep in mind:
- void *foo and not void * foo;
- if() { and not if()<TAB>{
- } else { and not {\nelse
-
- The streams stuff looks very cool though! :)
2002-03-16 00:05:47 +00:00
Harald Radi c1fe9cd279 ongoing development ... 2002-03-15 23:28:10 +00:00
foobar 207f26ae91 This entry belongs under 4.2.0. 2002-03-15 21:46:14 +00:00
Wez Furlong 0f65280cb5 New PHP streams... 2002-03-15 21:03:08 +00:00
Harald Radi 3a1ebd4f51 @ fixed a bug that caused php to crash in php_COM_get_ids_of_names() (Harald, Paul) 2002-03-15 20:48:26 +00:00
foobar 45711eaba2 - Corrected these entries. (catched by Derick) 2002-03-15 20:18:07 +00:00
foobar 913b7fecf9 - Fixed grammar, made some entries make more sense...etc. (proof read please :)
# People, PLEASE try keeping in mind that these entries are for
# the end-users. ie. they need to explain what was changed and why.
# And be consistent too..
2002-03-15 20:01:36 +00:00
Derick Rethans b5252e28dd - Fix proto (again) 2002-03-15 19:04:22 +00:00
Derick Rethans 108448f37a - proto fixes 2002-03-15 18:22:57 +00:00
jim winstead 12bc95432a don't redefine NDEBUG if it is already defined. yeesh. 2002-03-15 17:10:38 +00:00
Andi Gutmans c84a4ead95 - Pass TSRMLS to callbacks. 2002-03-15 16:26:17 +00:00
Andi Gutmans db84afb206 - Scope fix. When calling an imported function the scope will change
- correctly to the scope of the functions class.
<?php

	function Hello()
	{
		print "Wrong one\n";
	}

	class MyClass {
		static $hello = "Hello, World\n";

		function Hello()
		{
			print self::$hello;
		}

		function Trampoline()
		{
			Hello();
		}
	}

	import function Trampoline from MyClass;

	Trampoline();
?>
2002-03-15 15:28:06 +00:00
Daniela Mariaschi 716e6a03db added new ibase_fetch_assoc() php function 2002-03-15 15:26:01 +00:00
Andi Gutmans 0ce019f715 - Fix issues with $this when using it by itself without indirection such as
- $this->foo.
2002-03-15 15:09:46 +00:00
Stig Bakken fb624cb77a * "new and improved" iconv test 2002-03-15 13:56:32 +00:00
Harald Radi 720c40dd4e fixed HashTable allocation 2002-03-15 13:10:35 +00:00
Stig Bakken 2e597b8dc8 * fix for db3 from ports on freebsd 2002-03-15 11:26:47 +00:00
Andi Gutmans f7ec2505ca - Revert assert fix until it becomes clear what was wrong with my previous
- fix. I don't see any warnings when building with VC++ English.
2002-03-15 10:49:31 +00:00
Stig Bakken 9aa5afacee * yet another iconv config fix, should be able to handle most or all
configurations now (giconv/iconv, static libs only, iconv in libc etc.)
2002-03-15 10:06:37 +00:00
Yasuo Ohgaki 23917d0e0c Avoid warnings under VC.
# If you know how assert() should be used under VC, please fix it.
2002-03-15 06:36:56 +00:00
Yasuo Ohgaki 02202751a6 Added some fix. Clean up a bit. 2002-03-15 02:38:54 +00:00
Wez Furlong 1cc6a8e998 it's late; no more commits from me tonight... 2002-03-15 02:06:08 +00:00
Wez Furlong 0454ad4de8 should have diffed first... 2002-03-15 02:00:55 +00:00
Wez Furlong ae9db4e440 fix for ZE2 compile 2002-03-15 01:58:00 +00:00
57505b6a13 ChangeLog update 2002-03-15 01:19:57 +00:00
Harald Radi ff62e746d2 rpc apstraction module
does only work with ZendEngine2
2002-03-15 00:00:34 +00:00
Derick Rethans 7935e73749 - Fix bug #16078 2002-03-14 18:41:35 +00:00
Zeev Suraski 7b3660c6e8 Change case for consistency 2002-03-14 18:39:53 +00:00
Stanislav Malyshev 508c82ad2a more cleanup 2002-03-14 17:13:02 +00:00
Stanislav Malyshev 929bdc6998 Update howto 2002-03-14 17:08:06 +00:00
Stefan Esser cf4a292c5d fixed a typo within checkuid 2002-03-14 16:48:18 +00:00
Stanislav Malyshev 40becd37e5 fix for delete $this and unset $this 2002-03-14 16:00:48 +00:00
Andi Gutmans bb7f0a919a - Define HAVE_ASSERT_H under Windows. There was a macro redefinition before
- this.
2002-03-14 15:13:08 +00:00
Zeev Suraski d3256ecf00 Good suggestion, but I'm not sure we want to start receiving bug
reports with that version
2002-03-14 14:15:26 +00:00
Wez Furlong 93ad205756 fix buglet 2002-03-14 14:05:13 +00:00
Sterling Hughes 6489b9c316 update version 2002-03-14 14:00:04 +00:00
Zeev Suraski fb837bddaf Childish, are we? 2002-03-14 13:42:58 +00:00
foobar 186651bd06 - Fixed version 2002-03-14 13:39:36 +00:00
Zeev Suraski 20f3b718dc Make it clearer what this entry means 2002-03-14 13:35:19 +00:00
Zeev Suraski 075dc0ccc6 Fix version number 2002-03-14 13:27:43 +00:00
Derick Rethans bfa2653b61 - Whitespace part 1 2002-03-14 12:20:53 +00:00
Stanislav Malyshev 3af5b15f30 Fix call_user_function 2002-03-14 12:18:01 +00:00
Stefan Esser 77b5d80081 fixed: last commit had debug code in it 2002-03-14 11:26:10 +00:00
Stefan Esser 229e7769f4 fixed whitespace
fixed lots of possible bufferoverflows
fixed memoryleak
2002-03-14 11:22:53 +00:00
Yasuo Ohgaki dcd86d154e Fixed var_dump() crash when there is recursion.
# Since I said it's easy to fix :)
2002-03-14 09:36:13 +00:00
Stefan Roehrich c62a7c9474 Fixed NEWS entry, make it consistent with other entries. 2002-03-14 08:55:25 +00:00
Sebastian Bergmann 2ff115b01e Add note on which version of Apache 2 this SAPI module is compatible with. 2002-03-14 06:31:37 +00:00
Sean Bright 86dba965b1 Translate to English.
# I still don't know what a 'tag search' is...
2002-03-14 03:25:46 +00:00
Yasuo Ohgaki cbc1cd802c Include/enable assert.h/assert() when it is available 2002-03-14 02:17:23 +00:00
foobar aba912e66f - Fixed bug: #16047, #15865, and propably a few more.. 2002-03-14 01:45:02 +00:00
101667b33e NEWS update 2002-03-14 01:20:41 +00:00
a60e6c7c2a ChangeLog update 2002-03-14 01:19:51 +00:00
Stefan Roehrich 0d00602659 Fixed NEWS entry. 2002-03-13 21:00:44 +00:00
Jason Greene 8abf829c2a Fix CREDIT files, remove email address 2002-03-13 18:45:39 +00:00
1918 changed files with 561968 additions and 47 deletions

No files matched your search

+233
View File
@@ -0,0 +1,233 @@
PHP Coding Standards
====================
This file lists several standards that any programmer, adding or changing
code in PHP, should follow. Since this file was added at a very late
stage of the development of PHP v3.0, the code base does not (yet) fully
follow it, but it's going in that general direction. Since we are now
well into the version 4 releases, many sections have been recoded to use
these rules.
Code Implementation
-------------------
[1] Functions that are given pointers to resources should not free them
For instance, function int mail(char *to, char *from) should NOT free
to and/or from.
Exceptions:
- The function's designated behavior is freeing that resource. E.g. efree()
- The function is given a boolean argument, that controls whether or not
the function may free its arguments (if true - the function must free its
arguments, if false - it must not)
- Low-level parser routines, that are tightly integrated with the token
cache and the bison code for minimum memory copying overhead.
[2] Functions that are tightly integrated with other functions within the
same module, and rely on each other non-trivial behavior, should be
documented as such and declared 'static'. They should be avoided if
possible.
[3] Use definitions and macros whenever possible, so that constants have
meaningful names and can be easily manipulated. The only exceptions
to this rule are 0 and 1, when used as false and true (respectively).
Any other use of a numeric constant to specify different behavior
or actions should be done through a #define.
[4] When writing functions that deal with strings, be sure to remember
that PHP holds the length property of each string, and that it
shouldn't be calculated with strlen(). Write your functions in a such
a way so that they'll take advantage of the length property, both
for efficiency and in order for them to be binary-safe.
Functions that change strings and obtain their new lengths while
doing so, should return that new length, so it doesn't have to be
recalculated with strlen() (e.g. php_addslashes())
[5] Use php_error() to report any errors/warnings during code execution.
Use descriptive error messages, and try to avoid using identical
error strings for different stages of an error. For example,
if in order to obtain a URL you have to parse the URL, connect,
and retreive the text, assuming something can go wrong at each
of these stages, don't report an error "Unable to get URL"
on all of them, but instead, write something like "Unable
to parse URL", "Unable to connect to URL server" and "Unable
to fetch URL text", respectively.
[6] NEVER USE strncat(). If you're absolutely sure you know what you're doing,
check its man page again, and only then, consider using it, and even then,
try avoiding it.
[7] Use ZEND_* macros instead of PHP_* macros. Use of PHP_* macros is not
recommended. Since most of the PHP_* macros are ZEND_* macro aliases, using
the PHP_* macros makes browsing the source code with a tag search harder.
[8] Use assert(). assert.h is included in php.h if it is available. Not only
does good assertion catch bugs, but it also helps with code readability.
- Do not use assert for error handling. Use assert only for the
condition that must be always true.
- Do not use assignments in assert conditions. If you assign inside an
assert condition, you risk an elusive bug that would be very difficult
to spot in a debug build, due to the side effect of the assignment.
Function calls in assert conditions may also cause this problem, if
they modify one of their arguments or global variables.
Naming Conventions
------------------
[1] Function names for user-level functions should be enclosed with in
the PHP_FUNCTION() macro. They should be in lowercase, with words
underscore delimited, with care taken to minimize the letter count.
Abbreviations should not be used when they greatly decrease the
readability of the function name itself.
Good:
'mcrypt_enc_self_test'
'mysql_list_fields'
Ok:
'mcrypt_module_get_algo_supported_key_sizes'
(could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
'get_html_translation_table'
(could be 'html_get_trans_table'?)
Bad:
'hw_GetObjectByQueryCollObj'
'pg_setclientencoding'
'jf_n_s_i'
[2] If they are part of a "parent set" of functions, that parent should
be included in the user function name, and should be clearly related
to the parent program or function family. This should be in the form
of parent_*.
A family of 'foo' functions, for example:
Good:
'foo_select_bar'
'foo_insert_baz'
'foo_delete_baz'
Bad:
'fooselect_bar'
'fooinsertbaz'
'delete_foo_baz'
[3] Function names used by user functions should be prefixed
with "_php_", and followed by a word or an underscore-delimited list of
words, in lowercase letters, that describes the function. If applicable,
they should be declared 'static'.
[4] Variable names must be meaningful. One letter variable names must be
avoided, except for places where the variable has no real meaning or
a trivial meaning (e.g. for (i=0; i<100; i++) ...).
[5] Variable names should be in lowercase. Use underscores to separate
between words.
Syntax and indentation
----------------------
[1] Never use C++ style comments (i.e. // comment). Always use C-style
comments instead. PHP is written in C, and is aimed at compiling
under any ANSI-C compliant compiler. Even though many compilers
accept C++-style comments in C code, you have to ensure that your
code would compile with other compilers as well.
The only exception to this rule is code that is Win32-specific,
because the Win32 port is MS-Visual C++ specific, and this compiler
is known to accept C++-style comments in C code.
[2] Use K&R-style. Of course, we can't and don't want to
force anybody to use a style he or she is not used to, but,
at the very least, when you write code that goes into the core
of PHP or one of its standard modules, please maintain the K&R
style. This applies to just about everything, starting with
indentation and comment styles and up to function declaration
syntax.
(see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
[3] Be generous with whitespace and braces. Always prefer:
if (foo) {
bar;
}
to:
if(foo)bar;
Keep one empty line between the variable declaration section and
the statements in a block, as well as between logical statement
groups in a block. Maintain at least one empty line between
two functions, preferably two.
[4] When indenting, use the tab character. A tab is expected to represent
four spaces. It is important to maintain consistency in indenture so
that definitions, comments, and control structures line up correctly.
Documentation and Folding Hooks
-------------------------------
In order to make sure that the online documentation stays in line with
the code, each user-level function should have its user-level function
prototype before it along with a brief one-line description of what the
function does. It would look like this:
/* {{{ proto int abs(int number)
Returns the absolute value of the number */
PHP_FUNCTION(abs)
{
...
}
/* }}} */
The {{{ symbols are the default folding symbols for the folding mode in
Emacs and vim (set fdm=marker). Folding is very useful when dealing with
large files because you can scroll through the file quickly and just unfold
the function you wish to work on. The }}} at the end of each function marks
the end of the fold, and should be on a separate line.
The "proto" keyword there is just a helper for the doc/genfuncsummary script
which generates a full function summary. Having this keyword in front of the
function prototypes allows us to put folds elsewhere in the code without
messing up the function summary.
Optional arguments are written like this:
/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
Returns a header object with the defined parameters */
And yes, please keep the prototype on a single line, even if that line
is massive.
New and Experimental Functions
-----------------------------------
To reduce the problems normally associated with the first public
implementation of a new set of functions, it has been suggested
that the first implementation include a file labeled 'EXPERIMENTAL'
in the function directory, and that the functions follow the
standard prefixing conventions during their initial implementation.
The file labelled 'EXPERIMENTAL' should include the following
information:
Any authoring information (known bugs, future directions of the module).
Ongoing status notes which may not be appropriate for CVS comments.
Aliases & Legacy Documentation
-----------------------------------
You may also have some deprecated aliases with close to duplicate
names, for example, somedb_select_result and somedb_selectresult. For
documentation purposes, these will only be documented by the most
current name, with the aliases listed in the documentation for
the parent function. For ease of reference, user-functions with
completely different names, that alias to the same function (such as
highlight_file and show_source), will be separately documented. The
proto should still be included, describing which function is aliased.
Backwards compatible functions and names should be maintained as long
as the code can be reasonably be kept as part of the codebase. See
/phpdoc/README for more information on documentation.
+2
View File
@@ -0,0 +1,2 @@
For the list of people who've put work into PHP, please see
http://www.php.net/credits.php
+14855
View File
File diff suppressed because it is too large. Load diff
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+473
View File
@@ -0,0 +1,473 @@
List of PHP maintainers
=======================
Maintenance legend
------------------
Supported: Someone is actually paid to look after this.
Maintained: Someone actually looks after it.
Odd Fixes: It has a maintainer but they don't have time to do
much other than throw the odd patch in. See below.
Orphan: No current maintainer [but maybe you could take the
role as you write your new code].
Obsolete: Old code. Something tagged obsolete generally means
it has been replaced by a better system and you
should be using that.
Unknown: Not known at this time.
Status legend
-------------
Working: Working under both Windows and Unix.
Windows: Working only under Windows.
Unix: Working only under Unix.
Experimental: Under development or initial release.
Not Working: Not working.
Unknown: Status unknown.
== Server APIs ==
-------------------------------------------------------------------------------
EXTENSION: aolserver
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: apache
PRIMARY MAINTAINER: Rasmus Lerdorf <rasmus@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: apache2
PRIMARY MAINTAINER: Aaron Bannert <aaron@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
EXTENSION: cgi
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: fhttpd
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: isapi
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: nsapi
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: phttpd
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: pi3web
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: roxen
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: servlet
PRIMARY MAINTAINER: Sam Ruby <rubys@us.ibm.com>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: thttpd
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: webjames
PRIMARY MAINTAINER: Alex Waugh <alex@alexwaugh.com>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
== Database extensions ==
-------------------------------------------------------------------------------
EXTENSION: dba
PRIMARY MAINTAINER: Sascha Schumann <sascha@schumann.cx>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: dbase
PRIMARY MAINTAINER: Jim Winstead <jimw@php.net>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: dbx
PRIMARY MAINTAINER: Marc Boeren <M.Boeren@guidance.nl>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.6
COMMENT: DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
-------------------------------------------------------------------------------
EXTENSION: filepro
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: hyperwave
PRIMARY MAINTAINER: Uwe Steinmann <steinm@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: informix
PRIMARY MAINTAINER: Danny Heijl <Danny.Heijl@cevi.be>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: ingres_ii
PRIMARY MAINTAINER: David Hénot <henot@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
SINCE: 4.0.2
-------------------------------------------------------------------------------
EXTENSION: interbase
PRIMARY MAINTAINER: Jouni Ahto <jouni.ahto@exdec.fi>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: msql
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: msession
PRIMARY MAINTAINER Mark L. Woodward mlwmohawk@mohawksoft.com
MAINTENANCE: Maintained
STATUS: Working/Experimental
COMMENT: Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
-------------------------------------------------------------------------------
EXTENSION: mssql
PRIMARY MAINTAINER: Frank M. Kromann <fmk@swwwing.com>
MAINTENANCE: Maintained
STATUS: Working
COMMENT: Tested on phpts and isapi versions
-------------------------------------------------------------------------------
EXTENSION: mysql
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: pgsql
PRIMARY MAINTAINER: Yasuo Ohgaki <yohgaki@php.net>
MAINTENANCE: Maintained
STATUS: Working
COMMENT: Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
-------------------------------------------------------------------------------
EXTENSION: sybase
MAINTENANCE: Unknown
STATUS: Not Working
-------------------------------------------------------------------------------
EXTENSION: sybase_ct
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: oci8
PRIMARY MAINTAINER: Thies C. Arntzen <thies@thieso.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: odbc
PRIMARY MAINTAINER: Daniel R. Kalowsky <kalowsky@php.net>
MAINTENANCE: Maintained
STATUS: Working
COMMENT: Working except for persistent connections
-------------------------------------------------------------------------------
EXTENSION: oracle
PRIMARY MAINTAINER: Thies C. Arntzen <thies@thieso.net>
MAINTENANCE: Maintained
STATUS: Working
COMMENT: Using the new OCI8 driver is encouraged where possible.
-------------------------------------------------------------------------------
== Other extensions ==
-------------------------------------------------------------------------------
EXTENSION: aspell
MAINTENANCE: Unknown
STATUS: Working
COMMENT: For aspell .27 and greater, check out the pspell extension
-------------------------------------------------------------------------------
EXTENSION: bcmath
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: bz2
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.3
-------------------------------------------------------------------------------
EXTENSION: calendar
PRIMARY MAINTAINER: Hartmut Holzgraefe <hartmut@six.de>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: com
PRIMARY MAINTAINER: Harald Radi <h.radi@nme.at>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: cpdf
PRIMARY MAINTAINER: Uwe Steinmann <steinm@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: crack
MAINTENANCE: Unknown
STATUS: Experimental
SINCE: 4.0.5
-------------------------------------------------------------------------------
EXTENSION: ctype
PRIMARY MAINTAINER: Hartmut Holzgraefe <hartmut@six.de>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: curl
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.2
-------------------------------------------------------------------------------
EXTENSION: cybercash
PRIMARY MAINTAINER: Evan Klinger <evan715@sirius.com>
MAINTENANCE: Maintained
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: domxml
PRIMARY MAINTAINER: Uwe Steinmann <steinm@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
EXTENSION: dotnet
PRIMARY MAINTAINER: Sam Ruby <rubys@us.ibm.com>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
EXTENSION: exif
PRIMARY MAINTAINER: Marcus Boerger <helly@php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.2
-------------------------------------------------------------------------------
EXTENSION: fdf
PRIMARY MAINTAINER: Uwe Steinmann <steinm@php.net>
MAINTENANCE: Maintained
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: ftp
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: gd
PRIMARY MAINTAINER: Rasmus Lerdorf <rasmus@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: gettext
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: gmp
MAINTENANCE: Unknown
STATUS: Unknown
SINCE: 4.0.4
-------------------------------------------------------------------------------
EXTENSION: icap
MAINTENANCE: Unknown
STATUS: Obsolete
-------------------------------------------------------------------------------
EXTENSION: imap
PRIMARY MAINTAINER: Chuck Hagenbuch <chuck@horde.org>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: java
PRIMARY MAINTAINER: Sam Ruby <rubys@us.ibm.com>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: ldap
PRIMARY MAINTAINER: Stig Venaas <venaas@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mbstring
PRIMARY MAINTAINER: Rui Hirokawa <hirokawa@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mcal
PRIMARY MAINTAINER: Chuck Hagenbuch <chuck@horde.org>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mcrypt
PRIMARY MAINTAINER: Derick Rethans <d.rethans@jdimedia.nl>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mhash
PRIMARY MAINTAINER: Sascha Schumann <sascha@schumann.cx>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: muscat
PRIMARY MAINTAINER: Sam Liddicott <sam@ananova.com>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.5
COMMENT: Not tested against windows, only core API completed, rest under development
-------------------------------------------------------------------------------
EXTENSION: openssl
PRIMARY MAINTAINER: Wez Furlong <wez@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
SINCE: 4.0.4
-------------------------------------------------------------------------------
EXTENSION: overload
PRIMARY MAINTAINER: Andrei Zmievski <andrei@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
EXTENSION: pcre
PRIMARY MAINTAINER: Andrei Zmievski <andrei@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: pdf
PRIMARY MAINTAINER: Uwe Steinmann <steinm@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: pfpro
PRIMARY MAINTAINER: David Croft <david@infotrek.co.uk>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.2
-------------------------------------------------------------------------------
EXTENSION: posix
PRIMARY MAINTAINER: Kristian Köhntopp <kris@koehntopp.de>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: printer
PRIMARY MAINTAINER: Daniel Beulshausen <daniel@php4win.de>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 4.0.4
COMMENT: Only for Win32
-------------------------------------------------------------------------------
EXTENSION: pspell
PRIMARY MAINTAINER: Vlad Krupin <phpdevel@echospace.com>
MAINTENANCE: Unknown
STATUS: Unknown
SINCE: 4.0.2
-------------------------------------------------------------------------------
EXTENSION: qtdom
MAINTENANCE: Unknown
STATUS: Experimental
SINCE: 4.0.4
-------------------------------------------------------------------------------
EXTENSION: readline
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: recode
PRIMARY MAINTAINER: Kristian Köhntopp <kris@koehntopp.de>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: sablot
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANCE: Obsolete
STATUS: Experimental
SINCE: 4.0.3
-------------------------------------------------------------------------------
EXTENSION: satellite
PRIMARY MAINTAINER: David Eriksson <eriksson@php.net>
MAINTENANCE: Odd Fixes
STATUS: Experimental
SINCE: 4.0.3
-------------------------------------------------------------------------------
EXTENSION: session
PRIMARY MAINTAINER: Sascha Schumann <sascha@schumann.cx>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: shmop
PRIMARY MAINTAINER: Ilia Alshanetsky <iliaa@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
SINCE: 4.0.3
-------------------------------------------------------------------------------
EXTENSION: snmp
PRIMARY MAINTAINER: Rasmus Lerdorf <rasmus@php.net>
MAINTENANCE: Odd Fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: sockets
PRIMARY MAINTAINER: Chris Vandomelen <chrisv@b0rked.dhs.org>
MAINTENANCE: Maintained
STATUS: Experimental
SINCE: 4.0.2
-------------------------------------------------------------------------------
EXTENSION: swf
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANCE: Maintained
STATUS: Depreciated (Use the ming swf extension instead)
COMMENT: Only for Unix (won't change)
-------------------------------------------------------------------------------
EXTENSION: sysvsem
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: sysvshm
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: vpopmail
MAINTENANCE: Unknown
STATUS: Experimental
SINCE: 4.0.5
-------------------------------------------------------------------------------
EXTENSION: wddx
PRIMARY MAINTAINER: Andrei Zmievski <andrei@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xml
PRIMARY MAINTAINER: Thies C. Arntzen <thies@thieso.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: xslt
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANC: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: yaz
PRIMARY MAINTAINER: Adam Dickmeiss <adam@indexdata.dk>
MAINTENANCE: Maintained
STATUS: Unknown
SINCE: 4.0.1
-------------------------------------------------------------------------------
EXTENSION: yp
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: zlib
PRIMARY MAINTAINER: Stefan Roehrich <sr@linux.de>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: zziplib
PRIMARY MAINTAINER: Sterling Hughes <sterling@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
SINCE: 4.0.5
-------------------------------------------------------------------------------
# iptc?
+411
View File
@@ -0,0 +1,411 @@
Installation Instructions for PHP 4
-----------------------------------
STOP!
Before going any further, please remember you are going to find more
up to date instructions in the online manual, located here:
http://www.php.net/manual/en/install.apache.php
It is strongly recommended that you read the manual page before going
further. However, for the impatient, here is a quick set of steps that
will build PHP as (first) a dynamic Apache module (DSO) for Apache 1.3.x
with MySQL support and then a static module. A more verbose explanation follows.
For installing PHP on other web servers, refer to one of the following
files:
sapi/aolserver/README
sapi/pi3web/README
sapi/servlet/README
sapi/thttpd/README
README.Zeus
Some notes:
1: Only install either the static module or the dynamic one. Do not
install both.
2: If you are recompiling PHP to add new extensions or upgrading
something like GD, remove the config.cache file before you re-run
configure.
3: If you are on Linux and have installed shared libraries, make
sure the location of these shared libraries are listed in your
/etc/ld.so.conf file. For example, if you have:
/usr/local/lib/mysql/libmysqlclient.so
Make sure /etc/ld.so.conf contains:
/usr/local/lib/mysql
Then run ldconfig.
If you want both PHP 3 and 4 modules in the same Apache server, check the
bottom of this file for instructions.
INSTALLATION WITH THE ZEUS WEB SERVER:
--Please see the 'README.Zeus' file included in this distribution
QUICK INSTALL (DSO)
For this to work your Apache httpd must have mod_so enabled.
Check using httpd -l. You should see something like:
Compiled-in modules:
http_core.c
mod_so.c
Chances are you will see a lot more modules than these two. That's ok,
as long as mod_so.c shows up you can proceed with the following steps:
$ gunzip -c php-4.x.y.tar.gz | tar xf -
$ cd php-4.x.y
$ ./configure --with-mysql --with-apxs
$ make
$ make install
If you get an error telling you that the apxs script could not be found,
look for it on your system and if you find it, provide the full path to it
as: --with-apxs=/path/to/apxs
Next you must copy php.ini-dist to the appropriate place (normally
/usr/local/lib/php.ini) and edit it as necessary to set PHP options.
The only thing left to do is to edit your httpd.conf file and make sure the
PHP 4 mime type is there and uncommented. You need a line that looks like
this:
AddType application/x-httpd-php .php
Then restart your server (apachectl restart) and you should be able to
serve up PHP files now. Make a test file called test.php and put some
PHP tags in it. Like <?phpinfo()?>, for example.
QUICK INSTALL (Static)
$ gunzip -c apache_1.3.x.tar.gz | tar xf -
$ cd apache_1.3.x
$ ./configure
$ cd ..
$ gunzip -c php-4.x.y.tar.gz | tar xf -
$ cd php-4.x.y
$ ./configure --with-mysql --with-apache=../apache_1.3.x
$ make
$ make install
$ cd ../apache_1.3.x
$ ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a
(The above line is correct! Yes, we know libphp4.a does not exist at this
stage. It isn't supposed to. It will be created.)
$ make
(you should now have an httpd binary which you can copy to your Apache bin dir if
is is your first install then you need to "make install" as well)
$ cd ../php-4.x.y
$ cp php.ini-dist /usr/local/lib/php.ini
You can edit /usr/local/lib/php.ini file to set PHP options.
Edit your httpd.conf or srm.conf file and add:
AddType application/x-httpd-php .php
VERBOSE INSTALL
Chances are you are reading this because the quick install steps above
did not work for you. If this is the case, congratulations, you are
among the elite few that actually reads documentation. It really is
not a difficult install and once you have done it once you will fly
through it.
Installing PHP can be done in four simple steps:
1. Unpack your distribution file.
You will have downloaded a file named something like php-4.x.y.tar.gz.
Unzip this file with a command like: gunzip php-4.x.y.tar.gz
Next you have to untar it with: tar -xvf php-4.x.y.tar
This will create a php-4.x.y directory. cd into this new directory.
2a. Configure PHP (Dynamic Module) - Skip to 2b if you wish to build
a static module
You now have to choose the options you would like. There are quite
a few of them. To see a list, type: ./configure --help
The only options that you are likely to want to use are the ones in
the last section entitled, "--enable and --with options recognized:"
A popular choice is to build the Apache module version. In order to
build PHP as a dynamic module for Apache-1.3.x you have to first have
Apache installed. Assuming Apache is already installed, make sure
the shared object module is enabled. To check this, type: httpd -l
You should see something like:
Compiled-in modules:
http_core.c
mod_so.c
You will most likely have a lot more modules than what is shown here.
As long as mod_so.c shows up in the list, PHP should be happy.
Now, type: ./configure --with-mysql --with-apxs
If you get an error telling you that the apxs script could not be found,
look for it on your system and if you find it, provide the full path to it
as: --with-apxs=/path/to/apxs
You might also want other flags on this configure line. --with-mysql
is just an example.
There are a few things that can go wrong during this configure step.
The most common is that you have asked for an option and that the
configure script can not find the files required to enable this
option in PHP. Chances are you can provide the full path to the
base directory under which the related files were installed. For
example, if you have installed the GD library in /opt/gd which means
that /opt/gd/include has your GD header files and /opt/gd/lib contains
your GD library files, you would use --with-gd=/opt/gd
Skip to step 3 for compilation and installation instructions.
2b. Configure PHP (Static Module) - Skip if you performed 2a
You now have to choose the options you would like. There are quite
a few of them. To see a list, type: ./configure --help
The only options that you are likely to want to use are the ones in
the last section entitled, "--enable and --with options recognized:"
A popular choice is to build the Apache module version. You need
to know where the source code directory for your Apache server is
located. Then use an option like: --with-apache=/usr/local/src/apache
if that is your Apache source code directory. If you only specify
--with-apache, then it will default to look for your Apache source
in /usr/local/etc/httpd.
NOTE: The directory you specify should be the top-level of the
unpacked Apache (or Stronghold) distribution. The configure program
will automatically look for httpd.h in different directories under that
location depending on which version of Apache, including Stronghold,
you are running.
For MySQL support, since newer versions of MySQL installs its various
components under /usr/local, this is the default. If you have
changed the location you can specify it with: --with-mysql=/opt/local
for example. Otherwise just use: --with-mysql
*NOTE* If you are using Apache 1.3b6 or later, you should run the
Apache Configure script at least once before compiling PHP. It
doesn't matter how you have Apache configured at this point.
Skip to step 3b at this point.
3. Compile and install the files. Simply type: make install
3a. Dynamic Module Installation
Nothing else is needed here. Proceed to step 4a.
3b. Static Module Installation
For the Apache module version this will copy the appropriate files
to the src/modules/php4 directory in your Apache distribution if
you are using Apache 1.3.x. If you are still running Apache 1.2.x
these files will be copied directly to the main src directory.
For Apache 1.3b6 and later, you can use the new APACI configuration
mechanism. To automatically build Apache with PHP support, use:
cd apache_1.3.x
./configure --prefix=/<path>/apache \
--activate-module=src/modules/php4/libphp4.a
make
make install
If you do not wish to use this new configuration tool, the old
install procedure (src/Configure) will work fine.
If you are using the old Apache ./Configure script, you will have to
edit the Apache src/Configuration file manually. If you do not have
this file, copy Configuration.tmpl to Configuration.
For Apache 1.3.x add:
AddModule modules/php4/libphp4.a
For Apache 1.3.x don't do anything else. Just add this line and then
run "./Configure" followed by "make".
For Apache 1.2.x add:
Module php4_module mod_php4.o
For Apache 1.2.x you will also have to look in the libphp4.module file,
which was copied to the src directory. The EXTRA_LIBS line in the Apache
Configuration file needs to be set to use the same libs as specified on
the LIBS line in libphp4.module. You also need to make sure to add
"-L." to the beginning of the EXTRA_LIBS line.
So, as an example, your EXTRA_LIBS line might look like:
EXTRA_LIBS=-L. -lphp4 -lgdbm -ldb -L/usr/local/mysql/lib -lmysqlclient
NOTE: You should not enclose the EXTRA_LIBS line in double-quotes, as it
is in the libphp4.module file.
Also, look at the RULE_WANTHSREGEX setting in the libphp4.module file
and set the WANTHSREGEX directive accordingly in your Configuration file.
This last step applies to versions of Apache prior to 1.3b3.
This is a bit of a hassle, but should serve as incentive to move to
Apache 1.3.x where this step has been eliminated.
Once you are satisfied with your Configuration settings, type: ./Configure
If you get errors, chances are that you forgot a library or made a typo
somewhere. Re-edit Configuration and try again. If it goes well,
type: make
Assuming it compiles without errors, proceed to step 4b.
4a. Setting up the server. (Dynamic Module)
The make install command in step 3 should have done most of your
work for you. It actually edits your httpd.conf file and tries to
enable the dynamic PHP module. To verify this, look for a line that
looks like this:
LoadModule php4_module libexec/libphp4.so
The actual path before the libphp4.so part might differ slightly. This
is likely fine. If you are paranoid you can examine the output from the
make install step to see where the libphp4.so file was actually put and
place the full path to this file on this LoadModule line.
If somewhere in your httpd.conf file you have a ClearModuleList line
then you also need this line:
AddModule mod_php4.c
And finally you need to tell Apache which file extension should trigger
PHP. You do this by creating a special mime type and associating it
with an extension. We suggest using:
AddType application/x-httpd-php .php
You are however free to use any extension you wish, including .html.
Note! If a line has a # at the beginning, then it is commented out
and you need to remove the # for that line to take effect.
Finally you need to copy php.ini-dist to the appropriate place
(normally /usr/local/lib/php.ini) and edit if necessary.
Once you have made these changes you should be ready to restart your
server and try it out. Type: apachectl restart
4b. Setting up the server. (Static Module)
You should now have a new httpd binary. Shut down your existing server,
if you have one, and copy this new binary overtop of it. Perhaps make
a backup of your previous one first. Then edit your conf/httpd.conf file
and add the line:
AddType application/x-httpd-php .php
There is also an interesting feature which can be quite instructive and
helpful while debugging. That is the option of having colour syntax
highlighting. To enable this, add the following line:
AddType application/x-httpd-php-source .phps
Any file ending in .phps will now be displayed with full colour syntax
highlighting instead of being executed.
Note that on some older server setups, the AddType lines are in the
conf/srm.conf file instead of conf/httpd.conf.
Note! If a line has a # at the beginning, then it is commented out
and you need to remove the # for that line to take effect.
When you are finished making changes to your httpd.conf file, you need
to copy php.ini-dist to the appropriate place (normally
/usr/local/lib/php.ini) and edit if necessary. You can then
start up your server.
5. Testing it all worked
Create a test file named test.php in your web tree somewhere and
put some test PHP tags in it. <?phpinfo()?> is a good first test.
This tag tells PHP to do a braindump and tells you all sorts of things
about itself.
WHY DISABLING -fPIC WORKS ON LINUX
From: Martin v. Loewis <martin@loewis.home.cs.tu-berlin.de>
To: glibc-linux@ricardo.ecn.wfu.edu
Subject: Re: Shared library -shared vs. -fpic
[In reply to Kaz Kylheku <kaz@ashi.footprints.net>]
> PIC stands for Position-Independent Code.
Correct.
> Code isn't position-independent (or ``relocatable'') cannot be
> loaded at an arbitrary address;
Wrong.
> it requires some references to be patched at load time.
Correct.
> Shared libraries need to be relocatable because it's not known
> beforehand what address they will be loaded at
Correct, depending on the meaning of "relocatable". PIC code typically
does not contain relocations; that's why its position-independent.
> Just because you don't specify -fPIC doesn't mean that the compiler
> won't emit position-independent code; the option prevents it from
> emitting position-dependent code in situations where it otherwise
> would.
Correct. However, a non-trivial shared library typically won't be
position-independent unless explicitly compiled with
-fPIC. Linux/glibc indeed does not require a shared library to be
position-independent; instead, it will perform the relocations in the
binary, even if they refer to code pages. As a result, those relocated
pages won't be shared across processes, anymore.
Regards,
Martin
USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
With some (newer) installations of Apache, it's possible to compile both
PHP 3 and PHP 4, and run them concurrently.
Note, it's only really wise to do this if you need to use the PHP 3 engine
to maintain backwards compatibility.
To enable it, configure PHP 3 and PHP 4 to use APXS (--with-apxs) and the
necessary link extensions (--enable-versioning). Otherwise, all standard
installations instructions apply. For example:
$ ./configure \
--with-apxs=/apache/bin/apxs \
--enable-versioning \
--with-mysql \
+64
View File
@@ -0,0 +1,64 @@
--------------------------------------------------------------------
The PHP License, version 3.0a1
Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
3. The name "PHP" must not be used to endorse or promote products
derived from this software without prior permission from the
PHP Group. This does not apply to add-on libraries or tools
that work in conjunction with PHP. In such a case the PHP
name may be used to indicate that the product supports PHP.
4. The PHP Group may publish revised and/or new versions of the
license from time to time. Each version will be given a
distinguishing version number.
Once covered code has been published under a particular version
of the license, you may always continue to use it under the
terms of that version. You may also choose to use such covered
code under the terms of any subsequent version of the license
published by the PHP Group. No one other than the PHP Group has
the right to modify the terms applicable to covered code created
under this License.
5. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes PHP, freely available from
http://www.php.net/".
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.
The PHP Group can be contacted via Email at group@php.net.
For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.
This product includes the Zend Engine, freely available at
<http://www.zend.com>.
+18
View File
@@ -0,0 +1,18 @@
$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h
$(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
$(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c
$(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
$(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c
$(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
$(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h
+72
View File
@@ -0,0 +1,72 @@
mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
INSTALL = $(top_srcdir)/build/shtool install -c
INSTALL_DATA = $(INSTALL) -m 644
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
all: $(all_targets)
build-modules: $(PHP_MODULES)
libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
$(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
install: $(install_targets)
install-cli: sapi/cli/php
$(INSTALL_CLI)
install-sapi: libphp4.la
-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
break; \
fi; \
done; \
fi
$(INSTALL_IT)
install-modules:
@test -d modules && \
$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
echo "installing shared modules into $(EXTENSION_DIR)" && \
rm -f modules/*.la && \
cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
install-tester:
@echo "Installing regression tester"
@$(mkinstalldirs) $(PEAR_INSTALLDIR)
@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
install-su: install-pear install-tester
test: sapi/cli/php
@TEST_PHP_EXECUTABLE=$(top_builddir)/sapi/cli/php \
$(top_builddir)/sapi/cli/php -c php.ini-dist $(top_srcdir)/run-tests.php
clean:
find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a| xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
rm -f libphp4.la php sapi/cli/php modules/* libs/*
distclean: clean
rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp
find . -name Makefile | xargs rm -f
.PHONY: all clean install distclean test
.NOEXPORT:
+2059
View File
File diff suppressed because it is too large. Load diff
+115
View File
@@ -0,0 +1,115 @@
This is the first file you should be reading after you get your CVS account.
We'll assume you're basically familiar with CVS, but feel free to post
your questions on the mailing list. Please have a look at
http://cvsbook.red-bean.com/ for more detailed information on CVS.
PHP is developed through the efforts of a large number of people.
Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
some basic rules with regards to CVS usage will:
a. Make everybody happier, especially those responsible for maintaining
the CVS itself.
b. Keep the changes consistently well documented and easily trackable.
c. Prevent some of those 'Oops' moments.
d. Increase the general level of good will on planet Earth.
Having said that, here are the organizational rules:
1. Respect other people working on the project.
2. Discuss any significant changes on the list before committing.
3. Look at EXTENSIONS file to see who is the primary maintainer of
the code you want to contribute to.
4. If you "strongly disagree" about something another person did, don't
start fighting publicly - take it up in private email.
5. If you don't know how to do something, ask first!
6. Test your changes before committing them. We mean it. Really.
The next few rules are more of a technical nature.
1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
messages every day. Woe be to those who attempt to mess with it.
2. All news updates intended for public viewing, such as new features,
bug fixes, improvements, etc., should go into the NEWS file. Also see
the note below about automatically updating NEWS in your commit message.
3. Do not commit multiple file and dump all messages in one commit. If you
modified several unrelated files, commit each group separately and
provide a nice commit message for each one. See example below.
4. Do write your commit message in such a way that it makes sense even
without the corresponding diff. One should be able to look at it, and
immediately know what was modified. Definitely include the function name
in the message as shown below.
5. In your commit messages, keep each line shorter than 80 characters. And
try to align your lines vertically, if they wrap. It looks bad otherwise.
6. If you modified a function that is callable from PHP, prepend PHP to
the function name as shown below.
The format of the commit messages is pretty simple.
If a line begins with #, it is taken to be a comment and will not appear
in the ChangeLog. If the line begins with @, it will be redirected to the
NEWS file. Everything else goes into the ChangeLog.
It is important to note that if your comment or news logline spans multiple
lines, you have to put # or @ at the beginning of _every_ such line. Every
entry in NEWS has to have a name after it, so if you did it with someone's
help, put both your names there. Your name WILL NOT be automatically put
at the end of the NEWS entry - so, please provide it yourself.
Example. Say you modified two files, datetime.c and string.c. In datetime.c
you added a new format option for date() function, and in string.c you fixed
a memory leak in php_trim(). Don't commit both of these at once. Commit them
separately and try to make sure your commit messages look something like the
following.
For datetime.c:
(PHP date) Added new 'K' format modifier for printing out number of
days until New Year's Eve.
@- Added new 'K' format modifier that will output the number of days
@ until New Year's Eve. (Bob)
For string.c:
(php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
# Man, that thing was leaking all over the place!
@- Memory leak in trim() function has finally been fixed. (Bob)
The lines above marked with @ will go into NEWS file automagically, and the
# lines will be omitted from the ChangeLog. Alternatively, you might want
to modify NEWS file directly and not use the @ lines.
If you fix some bugs, you should note the bug ID numbers in your
commit message. Bug ID should be prefixed by "#" for easier access to
bug report when developers are browsing CVS via. LXR or Bonsai.
Example:
Fixed pgsql notice handler double free crash bug. Bug #14016
@ Fixed pgsql notice handler double free crash bug. Bug #14016
If you don't see your messages in ChangeLog and NEWS right away, don't worry!
These files are updated once a day, so your stuff will not show up until
somewhat later. Don't go adding stuff to NEWS by hand if you already put @
lines in the commit message.
You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
to look at PHP CVS repository in various ways.
To receive daily updates to ChangeLog and NEWS, send an empty message to
php-cvs-daily-subscribe@lists.php.net.
Happy hacking,
PHP Team
+39
View File
@@ -0,0 +1,39 @@
Between PHP 4.0.6 and 4.1.0, the Zend module struct changed in a way
that broke both source and binary compatibility. If you are
maintaining a third party extension, here's how to update it:
If this was your old module entry:
zend_module_entry foo_module_entry = {
"foo", /* extension name */
foo_functions, /* extension function list */
NULL, /* extension-wide startup function */
NULL, /* extension-wide shutdown function */
PHP_RINIT(foo), /* per-request startup function */
PHP_RSHUTDOWN(foo), /* per-request shutdown function */
PHP_MINFO(foo), /* information function */
STANDARD_MODULE_PROPERTIES
};
Here's how it should look if you want your code to build with PHP
4.1.0 and up:
zend_module_entry foo_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
#endif
"foo", /* extension name */
foo_functions, /* extension function list */
NULL, /* extension-wide startup function */
NULL, /* extension-wide shutdown function */
PHP_RINIT(foo), /* per-request startup function */
PHP_RSHUTDOWN(foo), /* per-request shutdown function */
PHP_MINFO(foo), /* information function */
#if ZEND_MODULE_API_NO >= 20010901
FOO_VERSION, /* extension version number (string) */
#endif
STANDARD_MODULE_PROPERTIES
};
If you don't care about source compatibility with earlier PHP releases
than 4.1.0, you can drop the #if/#endif lines.
+189
View File
@@ -0,0 +1,189 @@
WHAT IT IS
It's a tool for automatically creating the basic framework for a PHP module
and writing C code handling arguments passed to your functions from a simple
configuration file. See an example at the end of this file.
HOW TO USE IT
Very simple. First, cd do directory ext/ in PHP 4 sources. If you just need
the basic framework and will be writing all the code in your functions
yourself, you can now do
./ext_skel --extname=module_name
and everything you need is placed in directory module_name.
[ Note that GNU awk is likely required for this script to work. Debian
systems seem to default to using mawk, so you may need to change the
#! line in skeleton/create_stubs to use gawk explicitly. ]
If you don't need to test the existence of any external header files,
libraries or functions in them, the module is already almost ready to be
compiled in PHP. Just remove 3 comments in your_module_name/config.m4,
cd back up to PHP sources top directory, and do
./buildconf; ./configure --enable-module_name; make
But if you already have planned the overall scheme of your module, what
functions it will contain, their return types and the arguments they take
(a very good idea) and don't want to bother yourself with creating function
definitions and handling arguments passed yourself, it's time to create a
function definitions file, which you will give as an argument to ext_skel
with option
--proto=filename.
FORMAT OF FUNCTION DEFINITIONS FILE
All the definitions must be on one line. In it's simplest form, it's just
the function name, ie.
my_function
but then you'll be left with an almost empty function body without any
argument handling.
Arguments are given in parenthesis after the function name, and are of
the form 'argument_type argument_name'. Arguments are separated from each
other with a comma and optional space. Argument_type can be one of int,
bool, double, float, string, array, object or mixed.
An optional argument is separated from the previous by an optional space,
then '[' and of course comma and optional space, like all the other
arguments. You should close a row of optional arguments with same amount of
']'s as there where '['s. Currently, it does not harm if you forget to do it
or there is a wrong amount of ']'s, but this may change in the future.
An additional short description may be added after the parameters.
If present it will be filled into the 'proto' header comments in the stubs
code and the <refpurpose> tag in the XML documentation.
An example:
my_function(int arg1, int arg2 [, int arg3 [, int arg4]]) this is my 1st
Arguments arg3 and arg4 are optional.
If possible, the function definition should also contain it's return type
in front of the definition. It's not actually used for any C code generating
purposes but PHP in-source documentation instead, and as such, very useful.
It can be any of int, double, string, bool, array, object, resource, mixed
or void.
The file must contain nothing else but function definitions, no comments or
empty lines.
OTHER OPTIONS
--no-help
By default, ext_skel creates both comments in the source code and a test
function to help first time module writers to get started and testing
configuring and compiling their module. This option turns off all such things
which may just annoy experienced PHP module coders. Especially useful with
--stubs=file
which will leave out also all module specific stuff and write just function
stubs with function value declarations and passed argument handling, and
function entries and definitions at the end of the file, for copying and
pasting into an already existing module.
--assign-params
--string-lens
By default, function proto 'void foo(string bar)' creates the following:
...
zval **bar;
... (zend_get_parameters_ex() called in the middle...)
convert_to_string_ex(bar);
Specifying both of these options changes the generated code to:
...
zval **bar_arg;
int bar_len;
char *bar = NULL;
... (zend_get_parameters_ex() called in the middle...)
convert_to_string_ex(bar_arg);
bar = Z_STRVAL_PP(bar_arg);
bar_len = Z_STRLEN_PP(bar_arg);
You shouldn't have to ask what happens if you leave --string-lens out. If you
have to, it's questionable whether you should be reading this document.
--with-xml[=file]
Creates the basics for phpdoc .xml file.
--full-xml
Not implemented yet. When or if there will ever be created a framework for
self-contained extensions to use phpdoc system for their documentation, this
option enables it on the created xml file.
CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
Only arguments of types int, bool, double, float, string and array are
handled. For other types you must write the code yourself. And for type
mixed, it wouldn't even be possible to write anything, because only you
know what to expect.
It can't handle correctly, and probably never will, variable list of
of arguments. (void foo(int bar [, ...])
Don't trust the generated code too much. It tries to be useful in most of
the situations you might encounter, but automatic code generation will never
beat a programmer who knows the real situation at hand. ext_skel is generally
best suited for quickly generating a wrapper for c-library functions you
might want to have available in PHP too.
This program doesn't have a --help option. It has --no-help instead.
EXAMPLE
The following _one_ line
bool my_drawtext(resource image, string text, resource font, int x, int y [, int color])
will create this function definition for you (note that there are a few
question marks to be replaced by you, and you must of course add your own
value definitions too):
/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y[, int color])
*/
PHP_FUNCTION(my_drawtext)
{
zval **image, **text, **font, **x, **y, **color;
int argc;
int image_id = -1;
int font_id = -1;
argc = ZEND_NUM_ARGS();
if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
WRONG_PARAM_COUNT;
}
ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
switch (argc) {
case 6:
convert_to_long_ex(color);
/* Fall-through. */
case 5:
convert_to_long_ex(y);
convert_to_long_ex(x);
/* font: fetching resources already handled. */
convert_to_string_ex(text);
/* image: fetching resources already handled. */
break;
default:
WRONG_PARAM_COUNT;
}
php_error(E_WARNING, "my_drawtext: not yet implemented");
}
/* }}} */
+118
View File
@@ -0,0 +1,118 @@
New parameter parsing functions
===============================
It should be easier to parse input parameters to an extension function.
Hence, borrowing from Python's example, there are now a set of functions
that given the string of type specifiers, can parse the input parameters
and store the results in the user specified variables. This avoids most
of the IS_* checks and convert_to_* conversions. The functions also
check for the appropriate number of parameters, and try to output
meaningful error messages.
Prototypes
----------
/* Implemented. */
int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
The zend_parse_parameters() function takes the number of parameters
passed to the extension function, the type specifier string, and the
list of pointers to variables to store the results in. The _ex() version
also takes 'flags' argument -- current only ZEND_PARSE_PARAMS_QUIET can
be used as 'flags' to specify that the function should operate quietly
and not output any error messages.
Both functions return SUCCESS or FAILURE depending on the result.
The auto-conversions are performed as necessary. Arrays, objects, and
resources cannot be autoconverted.
Type specifiers
---------------
l - long
d - double
s - string (with possible null bytes) and its length
b - boolean, stored in zend_bool
r - resource (stored in zval)
a - array
o - object (of any type)
O - object (of specific type, specified by class entry)
z - the actual zval
The following characters also have a meaning in the specifier string:
| - indicates that the remaining parameters are optional, they
should be initialized to default values by the extension since they
will not be touched by the parsing function if they are not
passed to it.
/ - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
! - the parameter it follows can be of specified type or NULL (only applies
to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
pointer is set to NULL as well.
Examples
--------
/* Gets a long, a string and its length, and a zval */
long l;
char *s;
int s_len;
zval *param;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
&l, &s, &s_len, &param) == FAILURE) {
return;
}
/* Gets an object of class specified by my_ce, and an optional double. */
zval *obj;
double d = 0.5;
zend_class_entry my_ce;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
&obj, my_ce, &d) == FAILURE) {
return;
}
/* Gets an object or null, and an array.
If null is passed for object, obj will be set to NULL. */
zval *obj;
zval *arr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
&obj, &arr) == FAILURE) {
return;
}
/* Gets a separated array which can also be null. */
zval *arr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
&arr) == FAILURE) {
return;
}
/* Get only the first three parameters (useful for varargs functions). */
zval *z;
zend_bool b;
zval *r;
if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
&z, &b, &r) == FAILURE) {
return;
}
/* Get either a set of 3 longs or a string. */
long l1, l2, l3;
char *s;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
"lll", &l1, &l2, &l3) == SUCCESS) {
/* manipulate longs */
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
"s", &s) == SUCCESS) {
/* manipulate string */
} else {
/* output error */
return;
}
+57
View File
@@ -0,0 +1,57 @@
QNX4 Installation Notes
-----------------------
NOTE: General installation instructions are in the INSTALL file
1. To compile and test PHP3 you have to grab, compile and install:
- GNU dbm library or another db library;
- GNU bison (1.25 or later; 1.25 tested);
- GNU flex (any version supporting -o and -P options; 2.5.4 tested);
- GNU diffutils (any version supporting -w option; 2.7 tested);
2. To use CVS version you may need also:
- GNU CVS (1.9 tested);
- GNU autoconf (2.12 tested);
- GNU m4 (1.3 or later preferable; 1.4 tested);
3. To run configure define -lunix in command line:
LDFLAGS=-lunix ./configure
4. To use Sybase SQL Anywhere define ODBC_QNX and CUSTOM_ODBC_LIBS in
command line and run configure with --with-custom-odbc:
CFLAGS=-DODBC_QNX LDFLAGS=-lunix CUSTOM_ODBC_LIBS="-ldblib -lodbc" ./configure --with-custom-odbc=/usr/lib/sqlany50
If you have SQL Anywhere version 5.5.00, then you have to add
CFLAGS=-DSQLANY_BUG
to workaround its SQLFreeEnv() bug. Other versions has not been tested,
so try without this flag first.
5. To build the Apache module, you may have to hardcode an include path for
alloc.h in your Apache base directory:
- APACHE_DIRECTORY/src/httpd.h:
change #include "alloc.h"
to #include "APACHE_DIRECTORY/src/alloc.h"
Unless you want to use system regex library, you have to hardcode also
a path to regex.h:
- APACHE_DIRECTORY/src/conf.h:
change #include <regex.h>
to #include "APACHE_DIRECTORY/src/regex/regex.h"
I don't know so far why this required for QNX, may be it is Watcom
compiler problem.
If you building Apache module with SQL Anywhere support, you'll get
symbol conflict with BOOL. It is defined in Apache (httpd.h) and in
SQL Anywhere (odbc.h). This has nothing to do with PHP, so you have to
fix it yourself someway.
6. With above precautions, it should compile as is and pass regression
tests completely:
make
make check
make install
Don't bother me unless you really sure you made that all but it
still doesn't work.
June 28, 1998
Igor Kovalenko -- owl@infomarket.ru
+154
View File
@@ -0,0 +1,154 @@
$Id$
=============================================================================
HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
A self-contained extension can be distributed independently of
the PHP source. To create such an extension, three things are
required:
- Configuration file (config.m4)
- Source code for your module
We will describe now how to create these and how to put things
together.
PREPARING YOUR SYSTEM
While the result will run on any system, a developer's setup needs these
tools:
GNU autoconf
GNU automake
GNU libtool
GNU m4
All of these are available from
ftp://ftp.gnu.org/pub/gnu/
CONVERTING AN EXISTING EXTENSION
Just to show you how easy it is to create a self-contained
extension, we will convert an embedded extension into a
self-contained one. Install PHP and execute the following
commands.
$ mkdir /tmp/newext
$ cd /tmp/newext
You now have an empty directory. We will copy the files from
the mysql extension:
$ cp -rp php-4.0.X/ext/mysql/* .
It is time to finish the module. Run:
$ phpize
You can now ship the contents of the directory - the extension
can live completely on its own.
The user instructions boil down to
$ ./configure \
[--with-php-config=/path/to/php-config] \
[--with-mysql=MYSQL-DIR]
$ make install
The MySQL module will either use the embedded MySQL client
library or the MySQL installation in MYSQL-DIR.
DEFINING THE NEW EXTENSION
Our demo extension is called "foobar".
It consists of two source files "foo.c" and "bar.c"
(and any arbitrary amount of header files, but that is not
important here).
The demo extension does not reference any external
libraries (that is important, because the user does not
need to specify anything).
LTLIBRARY_SOURCES specifies the names of the sources files. You can
name an arbitrary number of source files here.
CREATING THE M4 CONFIGURATION FILE
The m4 configuration can perform additional checks. For a
self-contained extension, you do not need more than a few
macro calls.
------------------------------------------------------------------------------
PHP_ARG_ENABLE(foobar,whether to enable foobar,
[ --enable-foobar Enable foobar])
if test "$PHP_FOOBAR" != "no"; then
PHP_NEW_EXTENSION(foobar, foo.c bar.c, $ext_shared)
fi
------------------------------------------------------------------------------
PHP_ARG_ENABLE will automatically set the correct variables, so
that the extension will be enabled by PHP_NEW_EXTENSION in shared mode.
The first argument of PHP_NEW_EXTENSION describes the name of the
extension. The second names the source-code files. The third passes
$ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION.
Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
plan to distribute your module with PHP, these facilities allow you
to integrate your module easily into the main PHP module framework.
CREATING SOURCE FILES
ext_skel can be of great help when creating the common code for all modules
in PHP for you and also writing basic function definitions and C code for
handling arguments passed to your functions. See README.EXT_SKEL for further
information.
As for the rest, you are currently alone here. There are a lot of existing
modules, use a simple module as a starting point and add your own code.
CREATING THE SELF-CONTAINED EXTENSION
Put config.m4 and the source files into one directory. Afterwards,
run phpize (this is installed during make install by PHP 4.0).
For example, if you configured PHP with --prefix=/php, you would run
$ /php/bin/phpize
This will automatically copy the necessary build files and create
configure from your config.m4.
And that's it. You now have a self-contained extension.
INSTALLING A SELF-CONTAINED EXTENSION
An extension can be installed by running:
$ ./configure \
[--with-php-config=/path/to/php-config]
$ make install
ADDING SHARED MODULE SUPPORT TO A MODULE
In order to be useful, a self-contained extension must be loadable
as a shared module. I will explain now how you can add shared module
support to an existing module called foo.
1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
automatically be able to use --with-foo=shared[,..] or
--enable-foo=shared[,..].
2. In config.m4, use PHP_NEW_EXTENSION(foo,.., $ext_shared) to enable
building the extension.
3. Add the following lines to your C source file:
#ifdef COMPILE_DL_FOO
ZEND_GET_MODULE(foo)
#endif
+367
View File
@@ -0,0 +1,367 @@
An Overview of the PHP Streams abstraction
==========================================
$Id$
Please send comments to: Wez Furlong <wez@thebrainroom.com>
Why Streams?
============
You may have noticed a shed-load of issock parameters flying around the PHP
code; we don't want them - they are ugly and cumbersome and force you to
special case sockets and files everytime you need to work with a "user-level"
PHP file pointer.
Streams take care of that and present the PHP extension coder with an ANSI
stdio-alike API that looks much nicer and can be extended to support non file
based data sources.
Using Streams
=============
Streams use a php_stream* parameter just as ANSI stdio (fread etc.) use a
FILE* parameter.
The main functions are:
PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
count);
PHPAPI int php_stream_eof(php_stream * stream);
PHPAPI int php_stream_getc(php_stream * stream);
PHPAPI char *php_stream_gets(php_stream * stream, char *buf, size_t maxlen);
PHPAPI int php_stream_close(php_stream * stream);
PHPAPI int php_stream_flush(php_stream * stream);
PHPAPI int php_stream_seek(php_stream * stream, off_t offset, int whence);
PHPAPI off_t php_stream_tell(php_stream * stream);
These (should) behave in the same way as the ANSI stdio functions with similar
names: fread, fwrite, feof, fgetc, fgets, fclose, fflush, fseek, ftell.
Opening Streams
===============
In most cases, you should use this API:
PHPAPI php_stream *php_stream_open_wrapper(char *path, char *mode,
int options, char **opened_path TSRMLS_DC);
Where:
path is the file or resource to open.
mode is the stdio compatible mode eg: "wb", "rb" etc.
options is a combination of the following values:
IGNORE_PATH (default) - don't use include path to search for the file
USE_PATH - use include path to search for the file
IGNORE_URL - do not use plugin wrappers
REPORT_ERRORS - show errors in a standard format if something
goes wrong.
STREAM_MUST_SEEK - If you really need to be able to seek the stream
and don't need to be able to write to the original
file/URL, use this option to arrange for the stream
to be copied (if needed) into a stream that can
be seek()ed.
opened_path is used to return the path of the actual file opened,
but if you used STREAM_MUST_SEEK, may not be valid. You are
responsible for efree()ing opened_path. opened_path may be (and usually
is) NULL.
If you need to open a specific stream, or convert standard resources into
streams there are a range of functions to do this defined in php_streams.h.
A brief list of the most commonly used functions:
PHPAPI php_stream *php_stream_fopen_from_file(FILE *file, const char *mode);
Convert a FILE * into a stream.
PHPAPI php_stream *php_stream_fopen_tmpfile(void);
Open a FILE * with tmpfile() and convert into a stream.
PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
const char *pfx, char **opened_path TSRMLS_DC);
Generate a temporary file name and open it.
There are some network enabled relatives in php_network.h:
PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
Convert a socket into a stream.
PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
int socktype, int timeout, int persistent);
Open a connection to a host and return a stream.
PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
struct timeval *timeout);
Open a UNIX domain socket.
Stream Utilities
================
If you need to copy some data from one stream to another, you will be please
to know that the streams API provides a standard way to do this:
PHPAPI size_t php_stream_copy_to_stream(php_stream *src,
php_stream *dest, size_t maxlen);
If you want to copy all remaining data from the src stream, pass
PHP_STREAM_COPY_ALL as the maxlen parameter, otherwise maxlen indicates the
number of bytes to copy.
This function will try to use mmap where available to make the copying more
efficient.
If you want to read the contents of a stream into an allocated memory buffer,
you should use:
PHPAPI size_t php_stream_copy_to_mem(php_stream *src, char **buf,
size_t maxlen, int persistent);
This function will set buf to the address of the buffer that it allocated,
which will be maxlen bytes in length, or will be the entire length of the
data remaining on the stream if you set maxlen to PHP_STREAM_COPY_ALL.
The buffer is allocated using pemalloc(); you need to call pefree() to
release the memory when you are done.
As with copy_to_stream, this function will try use mmap where it can.
If you have an existing stream and need to be able to seek() it, you
can use this function to copy the contents into a new stream that can
be seek()ed:
PHPAPI int php_stream_make_seekable(php_stream *origstream, php_stream **newstream);
It returns one of the following values:
#define PHP_STREAM_UNCHANGED 0 /* orig stream was seekable anyway */
#define PHP_STREAM_RELEASED 1 /* newstream should be used; origstream is no longer valid */
#define PHP_STREAM_FAILED 2 /* an error occurred while attempting conversion */
#define PHP_STREAM_CRITICAL 3 /* an error occurred; origstream is in an unknown state; you should close origstream */
make_seekable will always set newstream to be the stream that is valid
if the function succeeds.
When you have finished, remember to close the stream.
NOTE: If you only need to seek forwards, there is no need to call this
function, as the php_stream_seek can emulate forward seeking when the
whence parameter is SEEK_CUR.
NOTE: Writing to the stream may not affect the original source, so it
only makes sense to use this for read-only use.
NOTE: If the origstream is network based, this function will block
until the whole contents have been downloaded.
NOTE: Never call this function with an origstream that is referenced
as a resource! It will close the origstream on success, and this
can lead to a crash when the resource is later used/released.
NOTE: If you are opening a stream and need it to be seekable, use the
STREAM_MUST_SEEK option to php_stream_open_wrapper();
Casting Streams
===============
What if your extension needs to access the FILE* of a user level file pointer?
You need to "cast" the stream into a FILE*, and this is how you do it:
FILE * fp;
php_stream * stream; /* already opened */
if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void*)&fp, REPORT_ERRORS) == FAILURE) {
RETURN_FALSE;
}
The prototype is:
PHPAPI int php_stream_cast(php_stream * stream, int castas, void ** ret, int
show_err);
The show_err parameter, if non-zero, will cause the function to display an
appropriate error message of type E_WARNING if the cast fails.
castas can be one of the following values:
PHP_STREAM_AS_STDIO - a stdio FILE*
PHP_STREAM_AS_FD - a generic file descriptor
PHP_STREAM_AS_SOCKETD - a socket descriptor
If you ask a socket stream for a FILE*, the abstraction will use fdopen to
create it for you. Be warned that doing so may cause buffered data to be lost
if you mix ANSI stdio calls on the FILE* with php stream calls on the stream.
If your system has the fopencookie function, php streams can synthesize a
FILE* on top of any stream, which is useful for SSL sockets, memory based
streams, data base streams etc. etc.
In situations where this is not desireable, you should query the stream
to see if it naturally supports FILE *. You can use this code snippet
for this purpose:
if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
/* can safely cast to FILE* with no adverse side effects */
}
You can use:
PHPAPI int php_stream_can_cast(php_stream * stream, int castas)
to find out if a stream can be cast, without actually performing the cast, so
to check if a stream is a socket you might use:
if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS) {
/* it can be a socket */
}
Please note the difference between php_stream_is and php_stream_can_cast;
stream_is tells you if the stream is a particular type of stream, whereas
can_cast tells you if the stream can be forced into the form you request.
The former doesn't change anything, while the later *might* change some
state in the stream.
Stream Internals
================
There are two main structures associated with a stream - the php_stream
itself, which holds some state information (and possibly a buffer) and a
php_stream_ops structure, which holds the "virtual method table" for the
underlying implementation.
The php_streams ops struct consists of pointers to methods that implement
read, write, close, flush, seek, gets and cast operations. Of these, an
implementation need only implement write, read, close and flush. The gets
method is intended to be used for streams if there is an underlying method
that can efficiently behave as fgets. The ops struct also contains a label
for the implementation that will be used when printing error messages - the
stdio implementation has a label of "STDIO" for example.
The idea is that a stream implementation defines a php_stream_ops struct, and
associates it with a php_stream using php_stream_alloc.
As an example, the php_stream_fopen() function looks like this:
PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
{
FILE * fp = fopen(filename, mode);
php_stream * ret;
if (fp) {
ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
if (ret)
return ret;
fclose(fp);
}
return NULL;
}
php_stream_stdio_ops is a php_stream_ops structure that can be used to handle
FILE* based streams.
A socket based stream would use code similar to that above to create a stream
to be passed back to fopen_wrapper (or it's yet to be implemented successor).
The prototype for php_stream_alloc is this:
PHPAPI php_stream * php_stream_alloc(php_stream_ops * ops, void * abstract,
size_t bufsize, int persistent, const char * mode)
ops is a pointer to the implementation,
abstract holds implementation specific data that is relevant to this instance
of the stream,
bufsize is the size of the buffer to use - if 0, then buffering at the stream
level will be disabled (recommended for underlying sources that implement
their own buffering - such a FILE*),
persistent controls how the memory is to be allocated - persistently so that
it lasts across requests, or non-persistently so that it is freed at the end
of a request (it uses pemalloc),
mode is the stdio-like mode of operation - php streams places no real meaning
in the mode parameter, except that it checks for a 'w' in the string when
attempting to write (this may change).
The mode parameter is passed on to fdopen/fopencookie when the stream is cast
into a FILE*, so it should be compatible with the mode parameter of fopen().
Writing your own stream implementation
======================================
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
RULE #1: when writing your own streams: make sure you have configured PHP with
--enable-debug.
I've taken some great pains to hook into the zend memory manager to help track
down allocation problems. It will also help you spot incorrect use of the
STREAMS_DC, STREAMS_CC and the semi-private STREAMS_REL_CC macros for function
definitions.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
RULE #2: Please use the stdio stream as a reference; it will help you
understand the semantics of the stream operations, and it will always
be more up to date than these docs :-)
First, you need to figure out what data you need to associate with the
php_stream. For example, you might need a pointer to some memory for memory
based streams, or if you were making a stream to read data from an RDBMS like
mysql, you might want to store the connection and rowset handles.
The stream has a field called abstract that you can use to hold this data.
If you need to store more than a single field of data, define a structure to
hold it, allocate it (use pemalloc with the persistent flag set
appropriately), and use the abstract pointer to refer to it.
For structured state you might have this:
struct my_state {
MYSQL conn;
MYSQL_RES * result;
};
struct my_state * state = pemalloc(sizeof(struct my_state), persistent);
/* initialize the connection, and run a query, using the fields in state to
* hold the results */
state->result = mysql_use_result(&state->conn);
/* now allocate the stream itself */
stream = php_stream_alloc(&my_ops, state, 0, persistent, "r");
/* now stream->abstract == state */
Once you have that part figured out, you can write your implementation and
define the your own php_stream_ops struct (we called it my_ops in the above
example).
For example, for reading from this wierd mysql stream:
static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
{
struct my_state * state = (struct my_state*)stream->abstract;
if (buf == NULL && count == 0) {
/* in this special case, php_streams is asking if we have reached the
* end of file */
if (... at end of file ...)
return EOF;
else
return 0;
}
/* pull out some data from the stream and put it in buf */
... mysql_fetch_row(state->result) ...
/* we could do something strange, like format the data as XML here,
and place that in the buf, but that brings in some complexities,
such as coping with a buffer size too small to hold the data,
so I won't even go in to how to do that here */
}
Implement the other operations - remember that write, read, close and flush
are all mandatory. The rest are optional. Declare your stream ops struct:
php_stream_ops my_ops = {
php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
php_mysqlop_flush, NULL, NULL, NULL,
"Strange mySQL example"
}
Thats it!
Take a look at the STDIO implementation in streams.c for more information
about how these operations work.
The main thing to remember is that in your close operation you need to release
and free the resources you allocated for the abstract field. In the case of
the example above, you need to use mysql_free_result on the rowset, close the
connection and then use pefree to dispose of the struct you allocated.
You may read the stream->persistent field to determine if your struct was
allocated in persistent mode or not.
vim:tw=78:et
+121
View File
@@ -0,0 +1,121 @@
Submitting Patch for PHP
========================
This document describes how to submit a patch for PHP. Since you are
reading this document, you are willing to submit a patch for PHP.
Please keep reading! Submitting a patch for PHP is easy. The hard
part is making it acceptable for inclusion into our repository. :-)
How to create patch?
--------------------
We are working with CVS. You need to get CVS source to create a patch
that we accept. Visit http://www.php.net/anoncvs.php to get CVS
source. You can check out older versions, but make sure you get
the default branch (i.e. Do not use -r option when you check out the
CVS source)
Read CODING_STANDARDS file before you start working.
Now you are ready to create a patch. Modify source to fix a bug in PHP or
add a new feature to PHP. After you finished editing, please test your
patch. Read README.TESTING for testing.
After you finish testing your patch, take diff file using
"cvs diff > your.patch" command.
Read README.TESTING for submitting a test script for your patch. This is
not strictly required, but it is preferred to submit a test script along
with your patch. Making new test script is very easy. It also helps us
to understand what you have been fixed or added to PHP.
Tips for creating patch
-----------------------
If you would like to fix multiple bugs. It is easier for us if you
could create 1 patch for 1 bug, but this is not strictly required.
Note though that you might get little response, if your patch is
too hard to review.
If you would like change/add many lines, it is better to ask module
maintainer and/or php-dev@lists.php.net, or pear-dev@lists.php.net if
you are patching PEAR. Official module maintainers can be found in
EXTENSIONS file in PHP source.
If you are new to CVS (Concurrent Versions System), visit
http://cvshome.org/ for details.
Recommended CVS client settings for creating patch file
------------------------------------------------------
Recommended ~/.cvsrc file setting is:
------
cvs -z3
update -d -P
checkout -P
diff -u
------
diff -u means:
-u Use the unified output format.
With this CVS setting, you don't have to worry about adding/deleting
newlines and spaces.
Check list for submitting patch
-------------------------------
- Did you run "make test" to check if your patch didn't break
other features?
- Did you compile PHP with --enable-debug and check php/webserver
error logs when you test your patch?
- Did you build PHP for multi-threaded web servers. (Optional)
- Did you create test script for "make test"? (Recommended)
- Did you check your patch is unified format and it does not
contain white space changes? (If you are not using recommended
cvs setting)
- Did you update CVS source before you take final patch?
- Did you read the patch again?
Where to send your patch?
-------------------------
If you are patching C source, send the patch to php-dev@lists.php.net.
If you are patching a module, you should also send the patch to the
maintainer. Official module maintainers are listed in EXTENSION file
in source.
If you are patching PEAR, send the patch to pear-dev@lists.php.net.
Please add the prefix "[PATCH]" to your email subject and make sure
to include the patch as a MIME attachment even if it is short.
Test scripts should be included in the same email.
Explain what has been fixed/added/changed by your patch.
Finally, add the bug Id(s) which can be closed by your patch, if any.
What happens after you submit your patch
--------------------------------------
If your patch is easy to review and has obviously no side-effects,
it might take up to a few hours until someone commits it.
Because this is a volunteer-driven effort, more complex patches will
require more patience on your side.
If you did not receive any feedback in a few days, please consider
resubmitting the description of your patch, along-side with
these questions:
- Is my patch too hard to review? Because of which factors?
- Should I split it up in multiple parts?
- Are there any unwanted whitespace changes?
What happens when your patch is applied?
----------------------------------------
Your name will be included together with your email address in the CVS
commit log. If your patch affects end-users, a brief description
and your name might be added to the NEWS file.
Thank you for submitting patch for PHP!
+175
View File
@@ -0,0 +1,175 @@
[IMPORTANT NOTICE]
------------------
Do _not_ ask to developers why some or all tests are failed under
your environment! Let us know if you find why it fails. Thank you.
[Testing Basics]
----------------
To execute test scripts, you must build PHP with some SAPI, then you
type "make test" to execute all or some test scripts saved under
"tests" directory under source root directory.
Usage:
make test
"make test" basically executes "run-tests.php" script
under source root. Therefore you can execute the script
as follows
./sapi/cli/php -c /path/to/php.ini/ run-tests.php [ext/some_extension_name]
[Which "php" executable "make test" look for]
---------------------------------------------
"make test" executes "run-tests.php" script with "php" binary. Some
test scripts such as session must be executed by CGI SAPI. Therefore,
you must build PHP with CGI SAPI to perform all tests.
If PHP is not build with CGI SAPI, "run-tests.php" script uses CLI
SAPI. Tests that may not executed by CLI SAPI will be skipped.
NOTE: PHP binary executing "run-tests.php" and php binary used for
executing test scripts may differ. If you use different PHP binary for
executing "run-tests.php" script, you may get errors.
[Which php.ini is used]
-----------------------
"make test" force to use php.ini-dist as default config file. If
you would like to test with other configuration file, user
"run-tests.php" script.
Example:
./sapi/cli/php -c /path/to/php.ini/ ext/standard
If you use php.ini other than php.ini-dist, you may see more failed
tests.
[Which test scripts are executed]
---------------------------------
"run-tests.php" ("make test") executes all test scripts by default
by looking all directory named "tests". If there are files have "phpt"
extension, "run-tests.php" takes test php code from the file and
executes it.
Tester can easily executes tests selectively with as follows.
Example:
./sapi/cli/php -c /path/to/php.ini/ run-tests.php ext/mbstring
[Test results]
--------------
Test results are printed to standard output. If there is a failed test,
"run-tests.php" script saves the result, expected result and code
executed to the test script directory. For example, if
ext/myext/tests/myext.phpt is failed to pass, following files are
created:
ext/myext/tests/myext.out - output from test script
ext/myext/tests/myext.exp - expected output
ext/myext/tests/myext.php - test script executed
Tester can verify these files, if failed test is actually a bug
or not.
[Creating new test files]
-------------------------
Writing test file is very easy if you are used to PHP. Test file
has following format. Here is a actual test file from iconv module.
===== ext/iconv/002.phpt =======
--TEST--
UCS4BE to ASCII
--SKIPIF--
<?php include('skipif.inc'); ?>
--POST--
--GET--
--FILE--
<?php include('002.inc'); ?>
--EXPECT--
&#97;&#98;&#99;&#100;
abcd
===== end of ext/iconv/002.phpt =======
"--TEST--" is title of the test.
"--SKIPIF--" is condition when to skip this test.
"--POST--" is POST variable passed to test script.
"--GET--" is GET variable passed to test script.
"--FILE--" is the test script.
"--EXPECT--" is the expected output from the test script.
ext/iconv/002.phpt uses 2 files. "skipif.inc" is used to skip
test when test cannot be performed such as iconv module is not
compiled or loaded.
==== ext/iconv/skipif.inc ====
<?php
// This script prints "skip" if condition does not meet.
if (!extension_loaded("iconv") && ini_get("enable_dl")) {
$dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
@dl("iconv$dlext");
}
if (!extension_loaded("iconv")) {
die("skip\n");
}
?>
==== end of ext/iconv/skipif.inc ====
ext/inconv/002.inc is the test script. "run-tests.php" script
executes test script with CGI executable.
==== ext/iconv/002.inc ===
<?php
/*
Expected output:
&#97;&#98;&#99;&#100;
abcd
*/
$s = unpack("V*", iconv("ascii","UCS-4LE", "abcd"));
foreach($s as $c) { print "&#$c;"; } print "\n";
$s = pack("NNNN", 97, 98, 99, 100);
$q = iconv("UCS-4BE", "ascii", $s);
print $q; print "\n";
?>
=== end of ext/iconv/002.inc ===
Test script and skipif code may be directly write into *.phpt.
However, it is recommended to use other files for ease of writing
test script. For instance, you can execute test script under
ext/iconv as follows:
./sapi/cli/php -c /path/to/php.ini/ ext/iconv
[How to help us]
----------------
If you find bug in PHP, you can submit bug report AND test script
for us. You don't have to write complete script, just give us test
script with following format. Please test the script and make sure
you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
submit.
<?php
/*
Bug #12345
substr() bug. Do not return expected string.
ACTUAL OUTPUT
XYXA
EXPECTED OUTPUT
ABCD
*/
$str = "XYZABCD";
echo substr($str,3,7);
?>
+123
View File
@@ -0,0 +1,123 @@
PHP Build System V5 Overview
- supports Makefile.ins during transition phase
- not-really-portable Makefile includes have been eliminated
- supports seperate build directories without VPATH by using
explicit rules only
- does not waste disk-space/CPU-time for building temporary libraries
=> especially noticeable on slower systems
- slow recursive make replaced with one global Makefile
- eases integration of proper dependencies
- adds PHP_DEFINE(what[, value]) which creates a single include-file
per what. This will allow more fine-grained dependencies.
- abandoning the "one library per directory" concept
- improved integration of the CLI
- several new targets
build-modules: builds and copies dynamic modules into modules/
install-cli: installs the CLI only, so that the install-sapi
target does only what its name says
- finally abandoned automake (still requires aclocal at this time)
- changed some configure-time constructs to run at buildconf-time
- upgraded shtool to 1.5.4
- removed $(moduledir) (use EXTENSION_DIR)
The Reason For a New System
It became more and more apparent that there is a severe need
for addressing the portability concerns and improving the chance
that your build is correct (how often have you been told to
"make clean"? When this is done, you won't need to anymore).
If You Build PHP on a Unix System
You, as a user of PHP, will notice no changes. Of course, the build
system will be faster, look better and work smarter.
If You Are Developing PHP
Extension developers:
Makefile.ins are abandoned. The files which are to be compiled
are specified in the config.m4 now using the following macro:
PHP_NEW_EXTENSION(foo, foo.c bar.c baz.cpp, $ext_shared)
E.g. this enables the extension foo which consists of three source-code
modules, two in C and one in C++. And dependending on the user's
wishes, the extension will even be built as a dynamic module.
The full syntax:
PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
Please have a look at acinclude.m4 for the gory details and meanings
of the other parameters.
And that's basically it for the extension side.
If you previously built sub-libraries for this module, add
the source-code files here as well. If you need to specify
separate include directories, do it this way:
PHP_NEW_EXTENSION(foo, foo.c mylib/bar.c mylib/gregor.c,,,-I@ext_srcdir@/lib)
E.g. this builds the three files which are located relative to the
extension source directory and compiles all three files with the
special include directive (@ext_srcdir@ is automatically replaced).
Now, you need to tell the build system that you want to build files
in a directory called $ext_builddir/lib:
PHP_ADD_BUILD_DIR($ext_builddir/lib)
Make sure to call this after PHP_NEW_EXTENSION, because $ext_builddir
is only set by the latter.
If you have a complex extension, you might to need add special
Make rules. You can do this by calling PHP_ADD_MAKEFILE_FRAGMENT
in your config.m4 after PHP_NEW_EXTENSION.
This will read a file in the source-dir of your extension called
Makefile.frag. In this file, $(builddir) and $(srcdir) will be
replaced by the values which are correct for your extension
and which are again determined by the PHP_NEW_EXTENSION macro.
Make sure to prefix *all* relative paths correctly with either
$(builddir) or $(srcdir). Because the build system does not
change the working directory anymore, we must use either
absolute paths or relative ones to the top build-directory.
Correct prefixing ensures that.
SAPI developers:
Instead of using PHP_SAPI=foo/PHP_BUILD_XYZ, you will need to type
PHP_SELECT_SAPI(name, type, sources.c)
I.e. specify the source-code files as above and also pass the
information regarding how PHP is supposed to be built (shared
module, program, etc).
For example for APXS:
PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c)
General info
The foundation for the new system is the flexible handling of
sources and their contexts. With the help of macros you
can define special flags for each source-file, where it is
located, in which target context it can work, etc.
Have a look at the well documented macros
PHP_ADD_SOURCES(_X) in acinclude.m4.
+126
View File
@@ -0,0 +1,126 @@
Using PHP4 with the Zeus Web Server
-----------------------------------
Zeus fully supports running PHP in combination with our
webserver. There are three different interfaces that can be used to
enable PHP:
* CGI
* ISAPI
* FastCGI
Of the three, we recommend using FastCGI, which has been tested and
benchmarked as providing the best performance and reliability.
Full details of how to install PHP are available from our
website, at:
http://support.zeus.com/products/php.html
If you have any problems, please check the support site for more
up-to-date information and advice.
Quick guide to installing FastCGI with Zeus
-------------------------------------------
Step 1 - obtain and install FastCGI development kit.
Grab the package from:
http://www.fastcgi.com/dist/devkit_2.2.0.tar.gz
Extract the package and follow the instructions:
./configure
make
make export
(run the last as root)
This will install to /usr/local/lib/libfcgi.a
and /usr/local/include/*fcgi*
Step 2 - Compile PHP as FastCGI.
Compile as follows:
./configure --with-fastcgi
make
Note that PHP has many options to the configure script -
e.g. --with-mysql. You will probably want to select your usual options
before compiling; the above is just a bare minimum, for illustration.
After compilation finishes, you will be left with an executable
program called 'php'. Copy this into your document root, under a
dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
Step 3 - configure Zeus
Four stages:
- enable FastCGI
- configure FastCGI
- setup alias for FastCGI
- setup alias for PHP
1) Using the admin server, go to the 'module configuration' page for
your virtual server, and ensure that 'fastcgi' is enabled (select the
tickbox to the left).
2) While we can run FastCGI's locally, there are known problems with
some OS's (specifically, the communication between web server and
FastCGI happens over a unix domain socket, and some OS's have trouble
sustaining high connection rates over these sockets). So instead, we
are going to set up the PHP FastCGI to run 'remotely' over localhost
(this uses TCP sockets, which do not suffer this problem). Go to the
'fastcgi configuration' page, and under 'add remote fastcgi':
Add Remote FastCGI
Docroot path /fcgi-bin/php
Remote machine localhost:8002
The first entry is where you saved PHP, above.
The second entry is localhost:<any unused port>
We will start the FastCGI listening on this port shortly.
Click 'update' to commit these changes.
3) Go to the path mapping module and add an alias for FastCGI:
Add Alias
Docroot path /fcgi-bin
Filesystem directory /path/to/docroot/fcgi-bin
Alias type fastcgi
Click 'update' to commit these changes
4) Also on the path mapping module, add a handler for PHP:
Add handler
File extension php
Handler /fcgi-bin/php
Click 'update' to commit these changes
Finally restart your virtual server for these changes to take effect.
Step 4 - start PHP as a FastCGI runner
When you start PHP, it will pre-fork a given number of child processes
to handle incoming PHP requests. Each process will handle a given
number of requests before exiting (and being replaced by a newly
forked process). You can control these two parameters by setting the
following environment variables BEFORE starting the FastCGI runner:
PHP_FCGI_CHILDREN - the number of child processes to pre-fork. If not
set, defaults to 8.
PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
handles before exiting. If not set, defaults to 500.
To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
8002 $DOCROOT/fcgi-bin/php'. Substitute the appropriate values for
$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
above.
To stop the runner (e.g. to experiment with the above environment
variables) you will need to manually stop and running PHP
processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
of children and not the runner, Zeus unfortunately cannot keep track
of what processes are running, sorry. A typical command line may look
like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
'{print $4}' | xargs kill'
+170
View File
@@ -0,0 +1,170 @@
Things to do or at least think about doing in the future. Name in
parenthesis means that person has taken on this project.
Zend
----
For PHP 4.3.0:
* Allow foreach ($array as $k => &$val) syntax. right now we cannot
traverse an array without copying each element.
* Allow foreach ($array as $k => list($a, $b)) syntax for multi
dimensional arrays.
* Look at replacing c-lib call tolower().
* Make hash API functions work with HASH_OF() to save time.
* Allow to set a default value for call-by-reference-parameters.
eg: function hello (&$pallo = NULL) {}
* Disallow function(method) redefinition in class.
* Add configure test to determine if dlsym() requires underscore and set
DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure,
for example. (DONE?)
For PHP 5.0.0:
* Native large number support (probably with GNU GMP)
* Const'ify APIs. Right now, many functions leave parameters untouched,
but don't declare those as const. This makes interaction with other
interfaces difficult which pass const parameters to us.
global
------
For PHP 4.3.0:
* Add aliases to functions to conform to new naming conventions, e.g.
str_to_upper().
* Make all extensions thread-safe.
* Make everything on the language-level independent of your locale
settings.
* Change PHP error messages, so that they point to pages or sections
in the PHP Manual.
* Make sure that all ZTS globals get destructed. Most ts_allocate_id()
calls should have a dtor entry.
* Activate all extensions by default that don't rely on external
dependencies. (eg ftp) (DONE?)
* on some platforms unimplemented function will just do nothing
(e.g. symlink) they should print a warning or not even be defined!
(DONE ?)
* Use arg_separator.input to implode args in the CGI sapi extension
and arg_separator.input to explode in php_build_argv(). (DONE?)
* Change the odbc_fetch_into() function to require ALWAYS the first two
parameters ($conn_id and $array), and make the third (row) be optional.
* Remove --with-openlink configure option (--with-iodbc replaces it).
* Implement flush feature suitable for nested output buffers.
For PHP 5.0.0
* bundle and use curl lib for fopen wrapper.
* --enable-all in configure. (--enable-shared=max ...)
* make configure print out a summary when it's done (like XEmacs)
* replace standard functions which work on static data with
reentrancy-safe functions (DONE?).
* make SAPI conform to CGI/1.1. Currently, all SAPI modules
define REMOTE_ADDR etc. themselves and reach only various level
of compliance.
* see what functions might need to be changed to use HashPosition, so
that the internal array pointer is not affected.
* Move most extensions and PEAR packages out of the PHP CVS tree,
include them again during release packaging.
Other
* use thread-safe resolver functions (either require BIND 8 or adns).
* implement javadoc based function docs template system.
* provide optional IPv6 support.
* find a better way to implement script timeouts. SIGVTALRM is used
by some POSIX threads implementations (i.e. OpenBSD) and is not
available in ZTS mode.
documentation
-------------
* Add remarks in the documentation which functions are not implemented
on win32.
* Add remarks in the documentation which functions are not binary-safe.
* Update curl documentation (DONE?)
* Add developer documentation.
* Add detailed documentation for Java extension.
ext/bz2
-------
* Add ini setting for decompression buffer size. The default 4k is to small
for big files and takes ages to decompress. However, 40k which perform
quite good with big files may be to much under certain environments as
default setting. There should be consideren different default sizes for
different SAPIS (e.g. apache and cli).
ext/curl
--------
* Have a warning scheme for when people use unsupported features.
ext/oci8
--------
* All OCIFetch*() functions should return 0 for no more data and false on
error.
* Have a flag that trims trailing spaces from CHAR fields on retrieval.
* Make allow_call_time_pass_reference=Off working.
* For additional todo information, see oci8.c, in ext/oci8
ext/pcre
--------
* Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
ext/pcntl
---------
* Change internal callback handler to use TICKS
* Remove all zend_extension code
* Add object callback support to pcntl_signal()
ext/pgsql
---------
For PHP 4.3.0:
* Add pg_metadata() with metadata cache feature.
* Add pg_convert() to check and convert array value for query.
* Add pg_insert/pg_update/pg_delete/pg_select for simple query.
ext/session
-----------
For PHP 4.3.0:
* session_abort() to abort session. ie: Do not save session data.
* Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
session vars regardless of register_globals setting.
Other:
* Maybe implement finer-grained session variables that could be
locked individually.
* Write a network-transparent storage back-end with fallover
facilities
* Provide a callback facility which is executed upon encountering
an unknown class name during deserialization
ext/sockets
-----------
* Implement IPv6
* Review/Fix vectors
ext/standard
------------
* Add a version number to data serialized via serialize().
* Possibly modify parsing of GPC data to automatically create arrays if
variable name is seen more than once.
* Implement regex-cache for url-functions.
* stri_replace(). (Andrei)
* Move socket related functions to fsock.c.
* NOT binary safe:
strtok()
basename()
dirname()
strrpos()
strrchr()
strip_tags()
ext/wddx
--------
* See if we can support the remaining data types:
dateTime
binary
http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
(Andrei)
* implement wddx_packet_as_javascript(). (Andrei)
other cool stuff
----------------
* PVM extension
+3
View File
@@ -0,0 +1,3 @@
- clean up .cvsignores
- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
with appropiate calls to PHP_NEW_EXTENSION
+26
View File
@@ -0,0 +1,26 @@
Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- Neither name of the copyright holders nor the names of their contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+6
View File
@@ -0,0 +1,6 @@
## process this file with automake to produce Makefile.am
AUTOMAKE_OPTIONS=foreign
noinst_LTLIBRARIES=libtsrm.la
libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
depend:
+2
View File
@@ -0,0 +1,2 @@
- Improve the lock in ts_resource_ex() in order to cover less code.
This can probably be done by more careful hash table access
+603
View File
@@ -0,0 +1,603 @@
/*
+----------------------------------------------------------------------+
| Thread Safe Resource Manager |
+----------------------------------------------------------------------+
| Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
| This source file is subject to the TSRM license, that is bundled |
| with this package in the file LICENSE |
+----------------------------------------------------------------------+
| Authors: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
#include "TSRM.h"
#ifdef ZTS
#include <stdio.h>
#include <stdlib.h>
#if HAVE_STDARG_H
#include <stdarg.h>
#endif
typedef struct _tsrm_tls_entry tsrm_tls_entry;
struct _tsrm_tls_entry {
void **storage;
int count;
THREAD_T thread_id;
tsrm_tls_entry *next;
};
typedef struct {
size_t size;
ts_allocate_ctor ctor;
ts_allocate_dtor dtor;
} tsrm_resource_type;
/* The memory manager table */
static tsrm_tls_entry **tsrm_tls_table=NULL;
static int tsrm_tls_table_size;
static ts_rsrc_id id_count;
/* The resource sizes table */
static tsrm_resource_type *resource_types_table=NULL;
static int resource_types_table_size;
static MUTEX_T tsmm_mutex; /* thread-safe memory manager mutex */
/* New thread handlers */
static tsrm_thread_begin_func_t tsrm_new_thread_begin_handler;
static tsrm_thread_end_func_t tsrm_new_thread_end_handler;
/* Debug support */
int tsrm_error(int level, const char *format, ...);
/* Read a resource from a thread's resource storage */
static int tsrm_error_level;
static FILE *tsrm_error_file;
#if TSRM_DEBUG
#define TSRM_ERROR(args) tsrm_error args
#define TSRM_SAFE_RETURN_RSRC(array, offset, range) \
{ \
int unshuffled_offset = TSRM_UNSHUFFLE_RSRC_ID(offset); \
\
if (offset==0) { \
return &array; \
} else if ((unshuffled_offset)>=0 && (unshuffled_offset)<(range)) { \
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Successfully fetched resource id %d for thread id %ld - 0x%0.8X", \
unshuffled_offset, (long) thread_resources->thread_id, array[unshuffled_offset])); \
return array[unshuffled_offset]; \
} else { \
TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Resource id %d is out of range (%d..%d)", \
unshuffled_offset, TSRM_SHUFFLE_RSRC_ID(0), TSRM_SHUFFLE_RSRC_ID(thread_resources->count-1))); \
return NULL; \
} \
}
#else
#define TSRM_ERROR
#define TSRM_SAFE_RETURN_RSRC(array, offset, range) \
if (offset==0) { \
return &array; \
} else { \
return array[TSRM_UNSHUFFLE_RSRC_ID(offset)]; \
}
#endif
#if defined(PTHREADS)
/* Thread local storage */
static pthread_key_t tls_key;
#elif defined(TSRM_ST)
static int tls_key;
#elif defined(TSRM_WIN32)
static DWORD tls_key;
#endif
/* Startup TSRM (call once for the entire process) */
TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
{
#if defined(GNUPTH)
pth_init();
#elif defined(PTHREADS)
pthread_key_create( &tls_key, 0 );
#elif defined(TSRM_ST)
st_init();
st_key_create(&tls_key, 0);
#elif defined(TSRM_WIN32)
tls_key = TlsAlloc();
#endif
tsrm_error_file = stderr;
tsrm_error_set(debug_level, debug_filename);
tsrm_tls_table_size = expected_threads;
tsrm_tls_table = (tsrm_tls_entry **) calloc(tsrm_tls_table_size, sizeof(tsrm_tls_entry *));
if (!tsrm_tls_table) {
TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate TLS table"));
return 0;
}
id_count=0;
resource_types_table_size = expected_resources;
resource_types_table = (tsrm_resource_type *) calloc(resource_types_table_size, sizeof(tsrm_resource_type));
if (!resource_types_table) {
TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate resource types table"));
free(tsrm_tls_table);
tsrm_tls_table = NULL;
return 0;
}
tsmm_mutex = tsrm_mutex_alloc();
tsrm_new_thread_begin_handler = tsrm_new_thread_end_handler = NULL;
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Started up TSRM, %d expected threads, %d expected resources", expected_threads, expected_resources));
return 1;
}
/* Shutdown TSRM (call once for the entire process) */
TSRM_API void tsrm_shutdown(void)
{
int i;
if (tsrm_tls_table) {
for (i=0; i<tsrm_tls_table_size; i++) {
tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
while (p) {
int j;
next_p = p->next;
for (j=0; j<id_count; j++) {
free(p->storage[j]);
}
free(p->storage);
free(p);
p = next_p;
}
}
free(tsrm_tls_table);
tsrm_tls_table = NULL;
}
if (resource_types_table) {
free(resource_types_table);
resource_types_table=NULL;
}
tsrm_mutex_free(tsmm_mutex);
tsmm_mutex = NULL;
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Shutdown TSRM"));
if (tsrm_error_file!=stderr) {
fclose(tsrm_error_file);
}
#if defined(GNUPTH)
pth_kill();
#elif defined(PTHREADS)
pthread_key_delete(tls_key);
#elif defined(TSRM_WIN32)
TlsFree(tls_key);
#endif
}
/* allocates a new thread-safe-resource id */
TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
{
int i;
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtaining a new resource id, %d bytes", size));
tsrm_mutex_lock(tsmm_mutex);
/* obtain a resource id */
*rsrc_id = TSRM_SHUFFLE_RSRC_ID(id_count++);
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Obtained resource id %d", *rsrc_id));
/* store the new resource type in the resource sizes table */
if (resource_types_table_size < id_count) {
resource_types_table = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
if (!resource_types_table) {
tsrm_mutex_unlock(tsmm_mutex);
TSRM_ERROR((TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource"));
*rsrc_id = 0;
return 0;
}
resource_types_table_size = id_count;
}
resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].size = size;
resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].ctor = ctor;
resource_types_table[TSRM_UNSHUFFLE_RSRC_ID(*rsrc_id)].dtor = dtor;
/* enlarge the arrays for the already active threads */
for (i=0; i<tsrm_tls_table_size; i++) {
tsrm_tls_entry *p = tsrm_tls_table[i];
while (p) {
if (p->count < id_count) {
int j;
p->storage = (void *) realloc(p->storage, sizeof(void *)*id_count);
for (j=p->count; j<id_count; j++) {
p->storage[j] = (void *) malloc(resource_types_table[j].size);
if (resource_types_table[j].ctor) {
resource_types_table[j].ctor(p->storage[j], &p->storage);
}
}
p->count = id_count;
}
p = p->next;
}
}
tsrm_mutex_unlock(tsmm_mutex);
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", *rsrc_id));
return *rsrc_id;
}
static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
{
int i;
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(sizeof(tsrm_tls_entry));
(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
(*thread_resources_ptr)->count = id_count;
(*thread_resources_ptr)->thread_id = thread_id;
(*thread_resources_ptr)->next = NULL;
#if defined(PTHREADS)
/* Set thread local storage to this new thread resources structure */
pthread_setspecific(tls_key, (void *) *thread_resources_ptr);
#elif defined(TSRM_ST)
st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
#elif defined(TSRM_WIN32)
TlsSetValue(tls_key, (void *) *thread_resources_ptr);
#endif
if (tsrm_new_thread_begin_handler) {
tsrm_new_thread_begin_handler(thread_id, &((*thread_resources_ptr)->storage));
}
for (i=0; i<id_count; i++) {
(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
if (resource_types_table[i].ctor) {
resource_types_table[i].ctor((*thread_resources_ptr)->storage[i], &(*thread_resources_ptr)->storage);
}
}
tsrm_mutex_unlock(tsmm_mutex);
if (tsrm_new_thread_end_handler) {
tsrm_new_thread_end_handler(thread_id, &((*thread_resources_ptr)->storage));
}
}
/* fetches the requested resource for the current thread */
TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
{
THREAD_T thread_id;
int hash_value;
tsrm_tls_entry *thread_resources;
if (!th_id) {
#if defined(PTHREADS)
/* Fast path for looking up the resources for the current
* thread. Its used by just about every call to
* ts_resource_ex(). This avoids the need for a mutex lock
* and our hashtable lookup.
*/
thread_resources = pthread_getspecific(tls_key);
#elif defined(TSRM_ST)
thread_resources = st_thread_getspecific(tls_key);
#elif defined(TSRM_WIN32)
thread_resources = TlsGetValue(tls_key);
#else
thread_resources = NULL;
#endif
if (thread_resources) {
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id));
/* Read a specific resource from the thread's resources.
* This is called outside of a mutex, so have to be aware about external
* changes to the structure as we read it.
*/
TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
}
thread_id = tsrm_thread_id();
} else {
thread_id = *th_id;
}
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for thread %ld", id, (long) thread_id));
tsrm_mutex_lock(tsmm_mutex);
hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
thread_resources = tsrm_tls_table[hash_value];
if (!thread_resources) {
allocate_new_resource(&tsrm_tls_table[hash_value], thread_id);
return ts_resource_ex(id, &thread_id);
} else {
do {
if (thread_resources->thread_id == thread_id) {
break;
}
if (thread_resources->next) {
thread_resources = thread_resources->next;
} else {
allocate_new_resource(&thread_resources->next, thread_id);
return ts_resource_ex(id, &thread_id);
/*
* thread_resources = thread_resources->next;
* break;
*/
}
} while (thread_resources);
}
tsrm_mutex_unlock(tsmm_mutex);
/* Read a specific resource from the thread's resources.
* This is called outside of a mutex, so have to be aware about external
* changes to the structure as we read it.
*/
TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
}
/* frees all resources allocated for the current thread */
void ts_free_thread(void)
{
tsrm_tls_entry *thread_resources;
int i;
THREAD_T thread_id = tsrm_thread_id();
int hash_value;
tsrm_tls_entry *last=NULL;
tsrm_mutex_lock(tsmm_mutex);
hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
thread_resources = tsrm_tls_table[hash_value];
while (thread_resources) {
if (thread_resources->thread_id == thread_id) {
for (i=0; i<thread_resources->count; i++) {
if (resource_types_table[i].dtor) {
resource_types_table[i].dtor(thread_resources->storage[i], &thread_resources->storage);
}
}
for (i=0; i<thread_resources->count; i++) {
free(thread_resources->storage[i]);
}
free(thread_resources->storage);
if (last) {
last->next = thread_resources->next;
} else {
tsrm_tls_table[hash_value] = thread_resources->next;
}
#if defined(PTHREADS)
pthread_setspecific(tls_key, 0);
#elif defined(TSRM_WIN32)
TlsSetValue(tls_key, 0);
#endif
free(thread_resources);
break;
}
if (thread_resources->next) {
last = thread_resources;
}
thread_resources = thread_resources->next;
}
tsrm_mutex_unlock(tsmm_mutex);
}
/* deallocates all occurrences of a given id */
void ts_free_id(ts_rsrc_id id)
{
}
/*
* Utility Functions
*/
/* Obtain the current thread id */
TSRM_API THREAD_T tsrm_thread_id(void)
{
#ifdef TSRM_WIN32
return GetCurrentThreadId();
#elif defined(NETWARE)
return NXThreadGetId();
#elif defined(GNUPTH)
return pth_self();
#elif defined(PTHREADS)
return pthread_self();
#elif defined(NSAPI)
return systhread_current();
#elif defined(PI3WEB)
return PIThread_getCurrent();
#elif defined(TSRM_ST)
return st_thread_self();
#endif
}
/* Allocate a mutex */
TSRM_API MUTEX_T tsrm_mutex_alloc(void)
{
MUTEX_T mutexp;
#ifdef NETWARE
long flags = 0; /* Don't require NX_MUTEX_RECURSIVE, I guess */
NXHierarchy_t order = 0;
NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
#endif
#ifdef TSRM_WIN32
mutexp = malloc(sizeof(CRITICAL_SECTION));
InitializeCriticalSection(mutexp);
#elif defined(NETWARE)
mutexp = NXMutexAlloc(flags, order, &lockInfo); /* return value ignored for now */
#elif defined(GNUPTH)
mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
pth_mutex_init(mutexp);
#elif defined(PTHREADS)
mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
pthread_mutex_init(mutexp,NULL);
#elif defined(NSAPI)
mutexp = crit_init();
#elif defined(PI3WEB)
mutexp = PIPlatform_allocLocalMutex();
#elif defined(TSRM_ST)
mutexp = st_mutex_new();
#endif
#ifdef THR_DEBUG
printf("Mutex created thread: %d\n",mythreadid());
#endif
return( mutexp );
}
/* Free a mutex */
TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
{
if (mutexp) {
#ifdef TSRM_WIN32
DeleteCriticalSection(mutexp);
#elif defined(NETWARE)
NXMutexFree(mutexp);
#elif defined(GNUPTH)
free(mutexp);
#elif defined(PTHREADS)
pthread_mutex_destroy(mutexp);
free(mutexp);
#elif defined(NSAPI)
crit_terminate(mutexp);
#elif defined(PI3WEB)
PISync_delete(mutexp);
#elif defined(TSRM_ST)
st_mutex_destroy(mutexp);
#endif
}
#ifdef THR_DEBUG
printf("Mutex freed thread: %d\n",mythreadid());
#endif
}
/* Lock a mutex */
TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
{
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
#ifdef TSRM_WIN32
EnterCriticalSection(mutexp);
return 1;
#elif defined(NETWARE)
return NXLock(mutexp);
#elif defined(GNUPTH)
return pth_mutex_acquire(mutexp, 0, NULL);
#elif defined(PTHREADS)
return pthread_mutex_lock(mutexp);
#elif defined(NSAPI)
return crit_enter(mutexp);
#elif defined(PI3WEB)
return PISync_lock(mutexp);
#elif defined(TSRM_ST)
return st_mutex_lock(mutexp);
#endif
}
/* Unlock a mutex */
TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
{
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
#ifdef TSRM_WIN32
LeaveCriticalSection(mutexp);
return 1;
#elif defined(NETWARE)
return NXUnlock(mutexp);
#elif defined(GNUPTH)
return pth_mutex_release(mutexp);
#elif defined(PTHREADS)
return pthread_mutex_unlock(mutexp);
#elif defined(NSAPI)
return crit_exit(mutexp);
#elif defined(PI3WEB)
return PISync_unlock(mutexp);
#elif defined(TSRM_ST)
return st_mutex_unlock(mutexp);
#endif
}
TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
{
void *retval = (void *) tsrm_new_thread_begin_handler;
tsrm_new_thread_begin_handler = new_thread_begin_handler;
return retval;
}
TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler)
{
void *retval = (void *) tsrm_new_thread_end_handler;
tsrm_new_thread_end_handler = new_thread_end_handler;
return retval;
}
/*
* Debug support
*/
#if TSRM_DEBUG
int tsrm_error(int level, const char *format, ...)
{
if (level<=tsrm_error_level) {
va_list args;
int size;
fprintf(tsrm_error_file, "TSRM: ");
va_start(args, format);
size = vfprintf(tsrm_error_file, format, args);
va_end(args);
fprintf(tsrm_error_file, "\n");
fflush(tsrm_error_file);
return size;
} else {
return 0;
}
}
#endif
void tsrm_error_set(int level, char *debug_filename)
{
tsrm_error_level = level;
#if TSRM_DEBUG
if (tsrm_error_file!=stderr) { /* close files opened earlier */
fclose(tsrm_error_file);
}
if (debug_filename) {
tsrm_error_file = fopen(debug_filename, "w");
if (!tsrm_error_file) {
tsrm_error_file = stderr;
}
} else {
tsrm_error_file = stderr;
}
#endif
}
#endif /* ZTS */
+186
View File
@@ -0,0 +1,186 @@
# Microsoft Developer Studio Project File - Name="TSRM" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=TSRM - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "TSRM.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "TSRM.mak" CFG="TSRM - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "TSRM - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
!MESSAGE "TSRM - Win32 Release_TS" (based on "Win32 (x86) Static Library")
!MESSAGE "TSRM - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
!MESSAGE "TSRM - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "TSRM - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "TSRM___Win32_Debug_TS"
# PROP BASE Intermediate_Dir "TSRM___Win32_Debug_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug_TS"
# PROP Intermediate_Dir "Debug_TS"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=1 /YX /FD /GZ /c
# ADD BASE RSC /l 0x40d /d "_DEBUG"
# ADD RSC /l 0x40d /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "TSRM - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "TSRM___Win32_Release_TS"
# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TS"
# PROP Intermediate_Dir "Release_TS"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
# ADD BASE RSC /l 0x40d /d "NDEBUG"
# ADD RSC /l 0x40d /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "TSRM - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "TSRM___Win32_Release_TS_inline"
# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS_inline"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TS_inline"
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
# ADD BASE RSC /l 0x40d /d "NDEBUG"
# ADD RSC /l 0x40d /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "TSRM - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "TSRM___Win32_Release_TSDbg"
# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TSDbg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TSDbg"
# PROP Intermediate_Dir "Release_TSDbg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
# ADD BASE RSC /l 0x40d /d "NDEBUG"
# ADD RSC /l 0x40d /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "TSRM - Win32 Debug_TS"
# Name "TSRM - Win32 Release_TS"
# Name "TSRM - Win32 Release_TS_inline"
# Name "TSRM - Win32 Release_TSDbg"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\TSRM.c
# End Source File
# Begin Source File
SOURCE=.\tsrm_strtok_r.c
# End Source File
# Begin Source File
SOURCE=.\tsrm_virtual_cwd.c
# End Source File
# Begin Source File
SOURCE=.\tsrm_win32.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\readdir.h
# End Source File
# Begin Source File
SOURCE=.\TSRM.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_config.w32.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_config_common.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_strtok_r.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_virtual_cwd.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_win32.h
# End Source File
# End Group
# End Target
# End Project
+150
View File
@@ -0,0 +1,150 @@
/*
+----------------------------------------------------------------------+
| Thread Safe Resource Manager |
+----------------------------------------------------------------------+
| Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
| This source file is subject to the TSRM license, that is bundled |
| with this package in the file LICENSE |
+----------------------------------------------------------------------+
| Authors: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
#ifndef TSRM_H
#define TSRM_H
/* #ifndef WIN32 */
#if !defined(WIN32) && !defined(NETWARE)
# include "tsrm_config.h"
#endif
#ifdef WIN32
# define TSRM_WIN32
#endif
#ifdef TSRM_WIN32
# ifdef TSRM_EXPORTS
# define TSRM_API __declspec(dllexport)
# else
# define TSRM_API __declspec(dllimport)
# endif
#else
# define TSRM_API
#endif
/* Only compile multi-threading functions if we're in ZTS mode */
#ifdef ZTS
#ifdef TSRM_WIN32
# include <windows.h>
#elif defined(NETWARE)
# include <nks/thread.h>
# include <nks/synch.h>
#elif defined(GNUPTH)
# include <pth.h>
#elif defined(PTHREADS)
# include <pthread.h>
#elif defined(TSRM_ST)
# include <st.h>
#endif
typedef int ts_rsrc_id;
/* Define THREAD_T and MUTEX_T */
#ifdef TSRM_WIN32
# define THREAD_T DWORD
# define MUTEX_T CRITICAL_SECTION *
#elif defined(NETWARE)
# define THREAD_T NXThreadId_t
# define MUTEX_T NXMutex_t *
#elif defined(GNUPTH)
# define THREAD_T pth_t
# define MUTEX_T pth_mutex_t *
#elif defined(PTHREADS)
# define THREAD_T pthread_t
# define MUTEX_T pthread_mutex_t *
#elif defined(NSAPI)
# define THREAD_T SYS_THREAD
# define MUTEX_T CRITICAL
#elif defined(PI3WEB)
# define THREAD_T PIThread *
# define MUTEX_T PISync *
#elif defined(TSRM_ST)
# define THREAD_T st_thread_t
# define MUTEX_T st_mutex_t
#endif
typedef void (*ts_allocate_ctor)(void *, void ***);
typedef void (*ts_allocate_dtor)(void *, void ***);
#define THREAD_HASH_OF(thr,ts) (unsigned long)thr%(unsigned long)ts
#ifdef __cplusplus
extern "C" {
#endif
/* startup/shutdown */
TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename);
TSRM_API void tsrm_shutdown(void);
/* allocates a new thread-safe-resource id */
TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor);
/* fetches the requested resource for the current thread */
TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
#define ts_resource(id) ts_resource_ex(id, NULL)
/* frees all resources allocated for the current thread */
TSRM_API void ts_free_thread(void);
/* deallocates all occurrences of a given id */
TSRM_API void ts_free_id(ts_rsrc_id id);
/* Debug support */
#define TSRM_ERROR_LEVEL_ERROR 1
#define TSRM_ERROR_LEVEL_CORE 2
#define TSRM_ERROR_LEVEL_INFO 3
typedef void (*tsrm_thread_begin_func_t)(THREAD_T thread_id, void ***tsrm_ls);
typedef void (*tsrm_thread_end_func_t)(THREAD_T thread_id, void ***tsrm_ls);
TSRM_API int tsrm_error(int level, const char *format, ...);
TSRM_API void tsrm_error_set(int level, char *debug_filename);
/* utility functions */
TSRM_API THREAD_T tsrm_thread_id(void);
TSRM_API MUTEX_T tsrm_mutex_alloc(void);
TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
#define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1)
#define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)-1)
#define TSRMLS_FETCH() void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
#define TSRMLS_D void ***tsrm_ls
#define TSRMLS_DC , TSRMLS_D
#define TSRMLS_C tsrm_ls
#define TSRMLS_CC , TSRMLS_C
#ifdef __cplusplus
}
#endif
#else /* non ZTS */
#define TSRMLS_FETCH()
#define TSRMLS_D void
#define TSRMLS_DC
#define TSRMLS_C
#define TSRMLS_CC
#endif /* ZTS */
#endif /* TSRM_H */
+1
View File
@@ -0,0 +1 @@
#undef PTHREADS
+5
View File
@@ -0,0 +1,5 @@
AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
])
+43
View File
@@ -0,0 +1,43 @@
# Makefile to generate build tools
#
# Standard usage:
# make -f build.mk
#
# Written by Sascha Schumann
#
# $Id$
LT_TARGETS = ltmain.sh ltconfig
config_h_in = tsrm_config.h.in
makefile_am_files = Makefile.am
makefile_in_files = $(makefile_am_files:.am=.in)
makefile_files = $(makefile_am_files:e.am=e)
targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
all: $(targets)
clean:
rm -f $(targets)
$(LT_TARGETS):
rm -f $(LT_TARGETS)
libtoolize --automake $(AMFLAGS) -f
$(makefile_in_files): $(makefile_am_files)
automake -a -i $(AMFLAGS) $(makefile_files)
aclocal.m4: configure.in acinclude.m4
aclocal
$(config_h_in): configure.in acconfig.h
# explicitly remove target since autoheader does not seem to work
# correctly otherwise (timestamps are not updated)
@rm -f $@
autoheader
configure: aclocal.m4 configure.in
autoconf
Executable
+33
View File
@@ -0,0 +1,33 @@
#!/bin/sh
case "$1" in
--copy)
automake_flags=--copy
shift
;;
esac
libtoolize --force --automake $automake_flags
mv aclocal.m4 aclocal.m4.old 2>/dev/null
aclocal
if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
echo "buildconf: keeping ${1}aclocal.m4"
mv aclocal.m4.old aclocal.m4
else
echo "buildconf: created or modified ${1}aclocal.m4"
fi
autoheader
automake --add-missing --include-deps $automake_flags
mv configure configure.old 2>/dev/null
autoconf
if cmp configure.old configure > /dev/null 2>&1; then
echo "buildconf: keeping ${1}configure"
mv configure.old configure
else
echo "buildconf: created or modified ${1}configure"
fi
+31
View File
@@ -0,0 +1,31 @@
dnl $Id$
dnl
dnl Minimalistic configure.in for TSRM.
dnl
AC_INIT(TSRM.c)
AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
AM_CONFIG_HEADER(tsrm_config.h)
sinclude(tsrm.m4)
TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
AM_PROG_LIBTOOL
if test "$enable_debug" != "yes"; then
AM_SET_LIBTOOL_VARIABLE([--silent])
fi
dnl TSRM_PTHREAD
AC_CHECK_HEADERS(
utime.h \
dirent.h \
stdarg.h \
alloca.h \
unistd.h \
limits.h
)
AC_OUTPUT(Makefile)
+44
View File
@@ -0,0 +1,44 @@
#ifndef READDIR_H
#define READDIR_H
/*
* Structures and types used to implement opendir/readdir/closedir
* on Windows 95/NT.
*/
#include <io.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
/* struct dirent - same as Unix */
struct dirent {
long d_ino; /* inode (always 1 in WIN32) */
off_t d_off; /* offset to this dirent */
unsigned short d_reclen; /* length of d_name */
char d_name[_MAX_FNAME + 1]; /* filename (null terminated) */
};
/* typedef DIR - not the same as Unix */
typedef struct {
long handle; /* _findfirst/_findnext handle */
short offset; /* offset into directory */
short finished; /* 1 if there are not more files */
struct _finddata_t fileinfo; /* from _findfirst/_findnext */
char *dir; /* the dir we are reading */
struct dirent dent; /* the dirent to return */
} DIR;
/* Function prototypes */
DIR *opendir(const char *);
struct dirent *readdir(DIR *);
int readdir_r(DIR *, struct dirent *, struct dirent **);
int closedir(DIR *);
void rewinddir(DIR *);
#endif /* READDIR_H */
+160
View File
@@ -0,0 +1,160 @@
dnl Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
dnl
dnl Redistribution and use in source and binary forms, with or without
dnl modification, are permitted provided that the following conditions
dnl are met:
dnl
dnl 1. Redistributions of source code must retain the above copyright
dnl notice, this list of conditions and the following disclaimer.
dnl
dnl 2. Redistributions in binary form must reproduce the above copyright
dnl notice, this list of conditions and the following disclaimer in
dnl the documentation and/or other materials provided with the
dnl distribution.
dnl
dnl THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
dnl EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
dnl PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SASCHA SCHUMANN OR
dnl HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
dnl NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
dnl LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
dnl OF THE POSSIBILITY OF SUCH DAMAGE.
dnl
dnl PTHREADS_FLAGS
dnl
dnl Set some magic defines to achieve POSIX threads conformance
dnl
AC_DEFUN(PTHREADS_FLAGS,[
if test -z "$host_alias" && test -n "$host"; then
host_alias=$host
fi
if test -z "$host_alias"; then
AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
fi
case $host_alias in
*solaris*)
PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
*freebsd*)
PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
*linux*)
PTHREAD_FLAGS=-D_REENTRANT;;
*aix*)
PTHREAD_FLAGS=-D_THREAD_SAFE;;
*irix*)
PTHREAD_FLAGS=-D_POSIX_THREAD_SAFE_FUNCTIONS;;
*hpux*)
PTHREAD_FLAGS=-D_REENTRANT;;
*sco*)
PTHREAD_FLAGS=-D_REENTRANT;;
dnl Solves sigwait() problem, creates problems with u_long etc.
dnl PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
esac
if test -n "$PTHREAD_FLAGS"; then
CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
fi
])dnl
dnl
dnl PTHREADS_CHECK_COMPILE
dnl
dnl Check whether the current setup can use POSIX threads calls
dnl
AC_DEFUN(PTHREADS_CHECK_COMPILE, [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
void *thread_routine(void *data) {
return data;
}
int main() {
pthread_t thd;
pthread_mutexattr_t mattr;
int data = 1;
pthread_mutexattr_init(&mattr);
return pthread_create(&thd, NULL, thread_routine, &data);
} ], [
pthreads_working=yes
], [
pthreads_working=no
], pthreads_working=no ) ] )dnl
dnl
dnl PTHREADS_CHECK()
dnl
dnl Try to find a way to enable POSIX threads
dnl
dnl Magic flags
dnl -kthread gcc (FreeBSD)
dnl -Kthread UDK cc (UnixWare)
dnl -mt WorkShop cc (Solaris)
dnl -mthreads gcc (AIX)
dnl -pthread gcc (Linux, FreeBSD, NetBSD, OpenBSD)
dnl -pthreads gcc (Solaris)
dnl -qthreaded AIX cc V5
dnl -threads gcc (HP-UX)
dnl
AC_DEFUN(PTHREADS_CHECK,[
save_CFLAGS=$CFLAGS
save_LIBS=$LIBS
PTHREADS_ASSIGN_VARS
PTHREADS_CHECK_COMPILE
LIBS=$save_LIBS
CFLAGS=$save_CFLAGS
AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
ac_cv_pthreads_cflags=
if test "$pthreads_working" != "yes"; then
for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
ac_save=$CFLAGS
CFLAGS="$CFLAGS $flag"
PTHREADS_CHECK_COMPILE
CFLAGS=$ac_save
if test "$pthreads_working" = "yes"; then
ac_cv_pthreads_cflags=$flag
break
fi
done
fi
])
AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
ac_cv_pthreads_lib=
if test "$pthreads_working" != "yes"; then
for lib in pthread pthreads c_r; do
ac_save=$LIBS
LIBS="$LIBS -l$lib"
PTHREADS_CHECK_COMPILE
LIBS=$ac_save
if test "$pthreads_working" = "yes"; then
ac_cv_pthreads_lib=$lib
break
fi
done
fi
])
if test "$pthreads_working" = "yes"; then
threads_result="POSIX-Threads found"
else
threads_result="POSIX-Threads not found"
fi
])dnl
dnl
dnl
AC_DEFUN(PTHREADS_ASSIGN_VARS,[
if test -n "$ac_cv_pthreads_lib"; then
LIBS="$LIBS -l$ac_cv_pthreads_lib"
fi
if test -n "$ac_cv_pthreads_cflags"; then
CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
fi
])dnl
+124
View File
@@ -0,0 +1,124 @@
dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
AC_DEFUN(TSRM_CHECK_GCC_ARG,[
gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
echo 'void somefunc() { };' > conftest.c
cmd='$CC $1 -c conftest.c'
if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
ac_result=no
else
ac_result=yes
fi
eval $gcc_arg_name=$ac_result
rm -f conftest.*
])
if eval test "\$$gcc_arg_name" = "yes"; then
$2
else
:
$3
fi
])
AC_DEFUN(TSRM_BASIC_CHECKS,[
AC_REQUIRE([AC_PROG_CC])dnl
dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_CHECK_HEADERS(stdarg.h)
])
AC_DEFUN(TSRM_CHECK_PTH,[
AC_MSG_CHECKING(for GNU Pth)
PTH_PREFIX="`$1 --prefix`"
if test -z "$PTH_PREFIX"; then
AC_MSG_RESULT(Please check your Pth installation)
fi
CPPFLAGS="$CPPFLAGS `$1 --cflags`"
LDFLAGS="$LDFLAGS `$1 --ldflags`"
LIBS="$LIBS `$1 --libs`"
AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
])
AC_DEFUN(TSRM_CHECK_ST,[
if test -r "$1/include/st.h"; then
CPPFLAGS="$CPPFLAGS -I$1/include"
LDFLAGS="$LDFLAGS -L$1/lib"
elif test -r "$1/st.h"; then
CPPFLAGS="$CPPFLAGS -I$1"
LDFLAGS="$LDFLAGS -L$1"
fi
AC_CHECK_HEADERS(st.h,[],[
AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix])
])
LIBS="$LIBS -lst"
AC_MSG_CHECKING(for SGI's State Threads)
AC_MSG_RESULT(yes)
AC_DEFINE(TSRM_ST, 1, [ ])
])
sinclude(threads.m4)
sinclude(TSRM/threads.m4)
AC_DEFUN(TSRM_CHECK_PTHREADS,[
PTHREADS_CHECK
if test "$pthreads_working" != "yes"; then
AC_MSG_ERROR(Your system seems to lack POSIX threads.)
fi
AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
AC_MSG_CHECKING(for POSIX threads)
AC_MSG_RESULT(yes)
])
AC_DEFUN(TSRM_THREADS_CHECKS,[
dnl For the thread implementations, we always use --with-*
dnl to maintain consistency
AC_ARG_WITH(tsrm-pth,
[ --with-tsrm-pth[=pth-config] Use GNU Pth.],[
TSRM_PTH=$withval
],[
TSRM_PTH=no
])
AC_ARG_WITH(tsrm-st,
[ --with-tsrm-st],[
TSRM_ST=$withval
],[
TSRM_ST=no
])
AC_ARG_WITH(tsrm-pthreads,
[ --with-tsrm-pthreads Use POSIX threads (default)],[
TSRM_PTHREADS=$withval
],[
TSRM_PTHREADS=yes
])
test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
if test "$TSRM_PTH" != "no"; then
TSRM_CHECK_PTH($TSRM_PTH)
elif test "$TSRM_ST" != "no"; then
TSRM_CHECK_ST($TSRM_ST)
elif test "$TSRM_PTHREADS" != "no"; then
TSRM_CHECK_PTHREADS
fi
])
+9
View File
@@ -0,0 +1,9 @@
#ifndef TSRM_CONFIG_NW_H
#define TSRM_CONFIG_NW_H
#define HAVE_UTIME 1
/* Though we have alloca(), this seems to be causing some problem with the stack pointer -- hence not using it */
/* #define HAVE_ALLOCA 1 */
#endif
+15
View File
@@ -0,0 +1,15 @@
#ifndef TSRM_CONFIG_W32_H
#define TSRM_CONFIG_W32_H
#define HAVE_UTIME 1
#define HAVE_ALLOCA 1
#undef inline
#ifdef ZEND_WIN32_FORCE_INLINE
# define inline __forceinline
#else
# define inline
#endif
#endif
+60
View File
@@ -0,0 +1,60 @@
#ifndef TSRM_CONFIG_COMMON_H
#define TSRM_CONFIG_COMMON_H
#if WINNT|WIN32
# define TSRM_WIN32
#endif
#ifdef TSRM_WIN32
# include "tsrm_config.w32.h"
#elif defined(NETWARE)
# include "tsrm_config.nw.h"
#else
# include "tsrm_config.h"
# include <sys/param.h>
#endif
#ifdef TSRM_WIN32
#include <malloc.h>
#endif
/* AIX requires this to be the first thing in the file. */
#ifndef __GNUC__
# if HAVE_ALLOCA_H
# include <alloca.h>
# else
# ifdef _AIX
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
# endif
# endif
# endif
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_LIMITS_H
#include <limits.h>
#endif
#ifndef MAXPATHLEN
# ifdef PATH_MAX
# define MAXPATHLEN PATH_MAX
# else
# define MAXPATHLEN 256
# endif
#endif
#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
# define tsrm_do_alloca(p) alloca(p)
# define tsrm_free_alloca(p)
#else
# define tsrm_do_alloca(p) malloc(p)
# define tsrm_free_alloca(p) free(p)
#endif
#endif /* TSRM_CONFIG_COMMON_H */
+260
View File
@@ -0,0 +1,260 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Venkat Raghavan S <rvenkat@novell.com> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include "TSRM.h"
#ifdef NETWARE
#ifdef USE_MKFIFO
#include <sys/stat.h>
#elif !defined(USE_PIPE_OPEN) /* NXFifoOpen */
#include <nks/fsio.h>
#endif
#include <nks/vm.h>
#include <nks/memory.h>
#include <string.h>
#include "mktemp.h"
/* strtok() call in LibC is abending when used in a different address space -- hence using
PHP's version itself for now : Venkat (30/4/02) */
#include "tsrm_strtok_r.h"
#define tsrm_strtok_r(a,b,c) strtok((a),(b))
#define WHITESPACE " \t"
#define MAX_ARGS 10
TSRM_API FILE* popen(const char *commandline, const char *type)
{
char *command = NULL, *argv[MAX_ARGS] = {'\0'}, **env = NULL;
char *tempName = "sys:/php/temp/phpXXXXXX.tmp";
char *filePath = NULL;
char *ptr = NULL;
int ptrLen = 0, argc = 0, i = 0, envCount = 0, err = 0;
FILE *stream = NULL;
#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
int pipe_handle;
int mode = O_RDONLY;
#else
NXHandle_t pipe_handle;
NXMode_t mode = NX_O_RDONLY;
#endif
NXExecEnvSpec_t envSpec;
NXNameSpec_t nameSpec;
NXVmId_t newVM = 0;
/* Check for validity of input parameters */
if (!commandline || !type)
return NULL;
/* Get temporary file name */
filePath = mktemp(tempName);
/*consoleprintf ("PHP | popen: file path = %s, mode = %s\n", filePath, type);*/
if (!filePath)
return NULL;
/* Set pipe mode according to type -- for now allow only "r" or "w" */
if (strcmp(type, "r") == 0)
#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
mode = O_RDONLY;
#else
mode = NX_O_RDONLY;
#endif
else if (strcmp(type, "w") == 0)
#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
mode = O_WRONLY;
#else
mode = NX_O_WRONLY;
#endif
else
return NULL;
#ifdef USE_PIPE_OPEN
pipe_handle = pipe_open(filePath, mode);
/*consoleprintf ("PHP | popen: pipe_open() returned %d\n", pipe_handle);*/
if (pipe_handle == -1)
return NULL;
#elif defined(USE_MKFIFO)
pipe_handle = mkfifo(filePath, mode);
consoleprintf ("PHP | popen: mkfifo() returned %d\n", pipe_handle);
if (pipe_handle == -1)
return NULL;
#else
/*
- NetWare doesn't require first parameter
- Allowing LibC to choose the buffer size for now
*/
err = NXFifoOpen(0, filePath, mode, 0, &pipe_handle);
/*consoleprintf ("PHP | popen: NXFifoOpen() returned %d\n", err);*/
if (err)
return NULL;
#endif
/* Copy the environment variables in preparation for the spawn call */
envCount = NXGetEnvCount() + 1; /* add one for NULL */
env = (char**)NXMemAlloc(sizeof(char*) * envCount, 0);
if (!env)
return NULL;
err = NXCopyEnv(env, envCount);
consoleprintf ("PHP | popen: NXCopyEnv() returned %d\n", err);
if (err)
{
NXMemFree (env);
return NULL;
}
/* Separate commandline string into words */
consoleprintf ("PHP | popen: commandline = %s\n", commandline);
ptr = tsrm_strtok_r((char*)commandline, WHITESPACE, NULL);
ptrLen = strlen(ptr);
command = (char*)malloc(ptrLen + 1);
if (!command)
{
NXMemFree (env);
return NULL;
}
strcpy (command, ptr);
ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
while (ptr && (argc < MAX_ARGS))
{
ptrLen = strlen(ptr);
argv[argc] = (char*)malloc(ptrLen + 1);
if (!argv[argc])
{
NXMemFree (env);
if (command)
free (command);
for (i = 0; i < argc; i++)
{
if (argv[i])
free (argv[i]);
}
return NULL;
}
strcpy (argv[argc], ptr);
argc++;
ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
}
consoleprintf ("PHP | popen: commandline string parsed into tokens\n");
/* Setup the execution environment and spawn new process */
envSpec.esFlags = 0; /* Not used */
envSpec.esArgc = argc;
envSpec.esArgv = (void**)argv;
envSpec.esEnv = (void**)env;
envSpec.esStdin.ssType =
envSpec.esStdout.ssType = NX_OBJ_FIFO;
envSpec.esStderr.ssType = NX_OBJ_FILE;
/*
envSpec.esStdin.ssHandle =
envSpec.esStdout.ssHandle =
envSpec.esStderr.ssHandle = -1;
*/
envSpec.esStdin.ssPathCtx =
envSpec.esStdout.ssPathCtx =
envSpec.esStderr.ssPathCtx = NULL;
#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
if (mode == O_RDONLY)
#else
if (mode == NX_O_RDONLY)
#endif
{
envSpec.esStdin.ssPath = filePath;
envSpec.esStdout.ssPath = stdout;
}
else /* Write Only */
{
envSpec.esStdin.ssPath = stdin;
envSpec.esStdout.ssPath = filePath;
}
envSpec.esStderr.ssPath = stdout;
nameSpec.ssType = NX_OBJ_FIFO;
/* nameSpec.ssHandle = 0; */ /* Not used */
nameSpec.ssPathCtx = NULL; /* Not used */
nameSpec.ssPath = argv[0];
consoleprintf ("PHP | popen: environment setup\n");
err = NXVmSpawn(&nameSpec, &envSpec, 0, &newVM);
consoleprintf ("PHP | popen: NXVmSpawn() returned %d\n", err);
if (!err)
/* Get file pointer corresponding to the pipe (file) opened */
stream = fdopen(pipe_handle, type);
/* Clean-up */
if (env)
NXMemFree (env);
if (pipe_handle)
#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
close(pipe_handle);
#else
NXClose(pipe_handle);
#endif
if (command)
free (command);
for (i = 0; i < argc; i++)
{
if (argv[i])
free (argv[i]);
}
consoleprintf ("PHP | popen: all clean-up done, returning...\n");
return stream;
}
TSRM_API int pclose(FILE* stream)
{
int err = 0;
NXHandle_t fd = 0;
/* Get the process associated with this pipe (file) handle and terminate it */
fd = fileno(stream);
NXClose (fd);
err = fclose(stream);
return err;
}
#endif
+28
View File
@@ -0,0 +1,28 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Venkat Raghavan S <rvenkat@novell.com> |
+----------------------------------------------------------------------+
*/
#ifndef TSRM_NW_H
#define TSRM_NW_H
#include "TSRM.h"
TSRM_API FILE* popen(const char *command, const char *type);
TSRM_API int pclose(FILE* stream);
#endif
+63
View File
@@ -0,0 +1,63 @@
#include <stdio.h>
#include "tsrm_config_common.h"
#include "tsrm_strtok_r.h"
static inline int in_character_class(char ch, const char *delim)
{
while (*delim) {
if (*delim == ch) {
return 1;
}
delim++;
}
return 0;
}
char *tsrm_strtok_r(char *s, const char *delim, char **last)
{
char *token;
if (s == NULL) {
s = *last;
}
while (*s && in_character_class(*s, delim)) {
s++;
}
if (!*s) {
return NULL;
}
token = s;
while (*s && !in_character_class(*s, delim)) {
s++;
}
if (!*s) {
*last = s;
} else {
*s = '\0';
*last = s + 1;
}
return token;
}
#if 0
main()
{
char foo[] = "/foo/bar//\\barbara";
char *last;
char *token;
token = tsrm_strtok_r(foo, "/\\", &last);
while (token) {
printf ("Token = '%s'\n", token);
token = tsrm_strtok_r(NULL, "/\\", &last);
}
return 0;
}
#endif
+6
View File
@@ -0,0 +1,6 @@
#ifndef TSRM_STRTOK_R
#define TSRM_STRTOK_R
char *tsrm_strtok_r(char *s, const char *delim, char **last);
#endif
+864
View File
@@ -0,0 +1,864 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Andi Gutmans <andi@zend.com> |
| Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <stdio.h>
#include <limits.h>
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include "tsrm_virtual_cwd.h"
#include "tsrm_strtok_r.h"
#ifdef TSRM_WIN32
#include <io.h>
#include "tsrm_win32.h"
#endif
#ifdef NETWARE
/*#include "pipe.h"*/
#include "tsrm_nw.h"
#endif
#define VIRTUAL_CWD_DEBUG 0
#include "TSRM.h"
/* Only need mutex for popen() in Windows and NetWare, because it doesn't chdir() on UNIX */
#if (defined(TSRM_WIN32) || defined(NETWARE)) && defined(ZTS)
MUTEX_T cwd_mutex;
#endif
#ifdef ZTS
static ts_rsrc_id cwd_globals_id;
#else
static virtual_cwd_globals cwd_globals;
#endif
cwd_state main_cwd_state; /* True global */
#ifndef TSRM_WIN32
#include <unistd.h>
#else
#include <direct.h>
#endif
#ifndef S_ISDIR
#define S_ISDIR(mode) ((mode) & _S_IFDIR)
#endif
#ifndef S_ISREG
#define S_ISREG(mode) ((mode) & _S_IFREG)
#endif
#ifdef TSRM_WIN32
#include <tchar.h>
#define tsrm_strtok_r(a,b,c) _tcstok((a),(b))
#define TOKENIZER_STRING "/\\"
static int php_check_dots(const char *element, int n)
{
while (n-- > 0) if (element[n] != '.') break;
return (n != -1);
}
#define IS_DIRECTORY_UP(element, len) \
(len >= 2 && !php_check_dots(element, len))
#define IS_DIRECTORY_CURRENT(element, len) \
(len == 1 && ptr[0] == '.')
#elif defined(NETWARE)
/* NetWare has strtok() (in LibC) and allows both slashes in paths, like Windows --
but rest of the stuff is like Unix */
/* strtok() call in LibC is abending when used in a different address space -- hence using
PHP's version itself for now */
/*#define tsrm_strtok_r(a,b,c) strtok((a),(b))*/
#define TOKENIZER_STRING "/\\"
#else
#define TOKENIZER_STRING "/"
#endif
/* default macros */
#ifndef IS_DIRECTORY_UP
#define IS_DIRECTORY_UP(element, len) \
(len == 2 && memcmp(element, "..", 2) == 0)
#endif
#ifndef IS_DIRECTORY_CURRENT
#define IS_DIRECTORY_CURRENT(element, len) \
(len == 1 && ptr[0] == '.')
#endif
/* define this to check semantics */
#define IS_DIR_OK(s) (1)
#ifndef IS_DIR_OK
#define IS_DIR_OK(state) (php_is_dir_ok(state) == 0)
#endif
#define CWD_STATE_COPY(d, s) \
(d)->cwd_length = (s)->cwd_length; \
(d)->cwd = (char *) malloc((s)->cwd_length+1); \
memcpy((d)->cwd, (s)->cwd, (s)->cwd_length+1);
#define CWD_STATE_FREE(s) \
free((s)->cwd);
static int php_is_dir_ok(const cwd_state *state)
{
#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
struct stat buf;
if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
#else
struct stat_libc buf;
if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISDIR(buf.st_mode))
#endif
return (0);
return (1);
}
static int php_is_file_ok(const cwd_state *state)
{
#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
struct stat buf;
if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
#else
struct stat_libc buf;
if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISREG(buf.st_mode))
#endif
return (0);
return (1);
}
static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
{
CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
}
static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC)
{
CWD_STATE_FREE(&cwd_globals->cwd);
}
static char *tsrm_strndup(const char *s, size_t length)
{
char *p;
p = (char *) malloc(length+1);
if (!p) {
return (char *)NULL;
}
if (length) {
memcpy(p,s,length);
}
p[length]=0;
return p;
}
CWD_API void virtual_cwd_startup(void)
{
char cwd[MAXPATHLEN];
char *result;
result = getcwd(cwd, sizeof(cwd));
if (!result) {
cwd[0] = '\0';
}
main_cwd_state.cwd = strdup(cwd);
main_cwd_state.cwd_length = strlen(cwd);
#ifdef ZTS
ts_allocate_id(&cwd_globals_id, sizeof(virtual_cwd_globals), (ts_allocate_ctor) cwd_globals_ctor, (ts_allocate_dtor) cwd_globals_dtor);
#else
cwd_globals_ctor(&cwd_globals TSRMLS_CC);
#endif
#if defined(TSRM_WIN32) && defined(ZTS)
cwd_mutex = tsrm_mutex_alloc();
#endif
}
CWD_API void virtual_cwd_shutdown(void)
{
#ifndef ZTS
cwd_globals_dtor(&cwd_globals TSRMLS_CC);
#endif
#if defined(TSRM_WIN32) && defined(ZTS)
tsrm_mutex_free(cwd_mutex);
#endif
free(main_cwd_state.cwd); /* Don't use CWD_STATE_FREE because the non global states will probably use emalloc()/efree() */
}
CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC)
{
cwd_state *state;
state = &CWDG(cwd);
if (state->cwd_length == 0) {
char *retval;
*length = 1;
retval = (char *) malloc(2);
retval[0] = DEFAULT_SLASH;
retval[1] = '\0';
return retval;
}
#ifdef TSRM_WIN32
/* If we have something like C: */
if (state->cwd_length == 2 && state->cwd[state->cwd_length-1] == ':') {
char *retval;
*length = state->cwd_length+1;
retval = (char *) malloc(*length+1);
memcpy(retval, state->cwd, *length);
retval[*length-1] = DEFAULT_SLASH;
retval[*length] = '\0';
return retval;
}
#endif
*length = state->cwd_length;
return strdup(state->cwd);
}
/* Same semantics as UNIX getcwd() */
CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
{
size_t length;
char *cwd;
cwd = virtual_getcwd_ex(&length TSRMLS_CC);
if (buf == NULL) {
return cwd;
}
if (length > size-1) {
free(cwd);
errno = ERANGE; /* Is this OK? */
return NULL;
}
memcpy(buf, cwd, length+1);
free(cwd);
return buf;
}
/* Resolve path relatively to state and put the real path into state */
/* returns 0 for ok, 1 for error */
CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path)
{
int path_length = strlen(path);
char *ptr, *path_copy;
char *tok = NULL;
int ptr_length;
cwd_state *old_state;
int ret = 0;
int copy_amount = -1;
char *free_path;
unsigned char is_absolute = 0;
#ifndef TSRM_WIN32
char resolved_path[MAXPATHLEN];
#endif
if (path_length == 0)
return (0);
#if !defined(TSRM_WIN32) && !defined(__BEOS__) && !defined(NETWARE)
if (IS_ABSOLUTE_PATH(path, path_length)) {
if (realpath(path, resolved_path)) {
path = resolved_path;
path_length = strlen(path);
}
} else { /* Concat current directory with relative path and then run realpath() on it */
char *tmp;
char *ptr;
ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
if (!tmp) {
return 1;
}
memcpy(ptr, state->cwd, state->cwd_length);
ptr += state->cwd_length;
*ptr++ = DEFAULT_SLASH;
memcpy(ptr, path, path_length);
ptr += path_length;
*ptr = '\0';
if (realpath(tmp, resolved_path)) {
path = resolved_path;
path_length = strlen(path);
}
free(tmp);
}
#endif
free_path = path_copy = tsrm_strndup(path, path_length);
old_state = (cwd_state *) malloc(sizeof(cwd_state));
CWD_STATE_COPY(old_state, state);
#if VIRTUAL_CWD_DEBUG
fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
#endif
if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
#ifndef NETWARE
copy_amount = COPY_WHEN_ABSOLUTE;
#else
copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
#endif
is_absolute = 1;
#ifdef TSRM_WIN32
} else if (IS_UNC_PATH(path_copy, path_length)) {
copy_amount = 2;
is_absolute = 1;
} else if (IS_SLASH(path_copy[0])) {
copy_amount = 2;
#endif
}
if (copy_amount != -1) {
state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
if (copy_amount) {
if (is_absolute) {
memcpy(state->cwd, path_copy, copy_amount);
path_copy += copy_amount;
} else {
memcpy(state->cwd, old_state->cwd, copy_amount);
}
}
state->cwd[copy_amount] = '\0';
state->cwd_length = copy_amount;
}
ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
while (ptr) {
ptr_length = strlen(ptr);
if (IS_DIRECTORY_UP(ptr, ptr_length)) {
char save;
save = DEFAULT_SLASH;
#define PREVIOUS state->cwd[state->cwd_length - 1]
while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
!IS_SLASH(PREVIOUS)) {
save = PREVIOUS;
PREVIOUS = '\0';
state->cwd_length--;
}
if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
state->cwd[state->cwd_length++] = save;
state->cwd[state->cwd_length] = '\0';
} else {
PREVIOUS = '\0';
state->cwd_length--;
}
} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
#ifdef TSRM_WIN32
/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') ||
IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
state->cwd[state->cwd_length++] = DEFAULT_SLASH;
}
#elif defined(NETWARE)
/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
if (ptr[ptr_length-1] != ':') {
state->cwd[state->cwd_length++] = DEFAULT_SLASH;
}
#else
state->cwd[state->cwd_length++] = DEFAULT_SLASH;
#endif
memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
state->cwd_length += ptr_length;
}
ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
}
/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
#ifndef NETWARE
if (state->cwd_length == COPY_WHEN_ABSOLUTE) {
#else
if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
#endif
state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
state->cwd[state->cwd_length] = DEFAULT_SLASH;
state->cwd[state->cwd_length+1] = '\0';
state->cwd_length++;
}
if (verify_path && verify_path(state)) {
CWD_STATE_FREE(state);
*state = *old_state;
ret = 1;
} else {
CWD_STATE_FREE(old_state);
ret = 0;
}
free(old_state);
free(free_path);
#if VIRTUAL_CWD_DEBUG
fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
#endif
return (ret);
}
CWD_API int virtual_chdir(const char *path TSRMLS_DC)
{
return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
}
CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
{
int length = strlen(path);
char *temp;
int retval;
if (length == 0) {
return 1; /* Can't cd to empty string */
}
while(--length >= 0 && !IS_SLASH(path[length])) {
}
if (length == -1) {
/* No directory only file name */
errno = ENOENT;
return -1;
}
/* COPY_WHEN_ABSOLUTE needs to account for volume name that is unique to NetWare absolute paths */
#ifndef NETWARE
if (length == COPY_WHEN_ABSOLUTE && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
#else
if (length == COPY_WHEN_ABSOLUTE(path) && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
#endif
length++;
}
temp = (char *) tsrm_do_alloca(length+1);
memcpy(temp, path, length);
temp[length] = 0;
#if VIRTUAL_CWD_DEBUG
fprintf (stderr, "Changing directory to %s\n", temp);
#endif
retval = p_chdir(temp TSRMLS_CC);
tsrm_free_alloca(temp);
return retval;
}
CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
retval = virtual_file_ex(&new_state, path, NULL);
if (!retval) {
int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
memcpy(real_path, new_state.cwd, len);
real_path[len] = '\0';
return real_path;
}
return NULL;
}
CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
retval = virtual_file_ex(&new_state, path, verify_path);
*filepath = new_state.cwd;
return retval;
}
CWD_API int virtual_filepath(const char *path, char **filepath TSRMLS_DC)
{
return virtual_filepath_ex(path, filepath, php_is_file_ok TSRMLS_CC);
}
CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
{
cwd_state new_state;
FILE *f;
if (path[0] == '\0') { /* Fail to open empty path */
return NULL;
}
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
f = fopen(new_state.cwd, mode);
CWD_STATE_FREE(&new_state);
return f;
}
#if HAVE_UTIME
CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
{
cwd_state new_state;
int ret;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, filename, NULL);
ret = utime(new_state.cwd, buf);
CWD_STATE_FREE(&new_state);
return ret;
}
#endif
CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
{
cwd_state new_state;
int ret;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, filename, NULL);
ret = chmod(new_state.cwd, mode);
CWD_STATE_FREE(&new_state);
return ret;
}
#if !defined(TSRM_WIN32) && !defined(NETWARE)
CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC)
{
cwd_state new_state;
int ret;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, filename, NULL);
ret = chown(new_state.cwd, owner, group);
CWD_STATE_FREE(&new_state);
return ret;
}
#endif
CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
{
cwd_state new_state;
int f;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
if (flags & O_CREAT) {
mode_t mode;
va_list arg;
va_start(arg, flags);
mode = (mode_t) va_arg(arg, int);
va_end(arg);
f = open(new_state.cwd, flags, mode);
} else {
f = open(new_state.cwd, flags);
}
CWD_STATE_FREE(&new_state);
return f;
}
CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
{
cwd_state new_state;
int f;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
f = creat(new_state.cwd, mode);
CWD_STATE_FREE(&new_state);
return f;
}
CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
{
cwd_state old_state;
cwd_state new_state;
int retval;
CWD_STATE_COPY(&old_state, &CWDG(cwd));
virtual_file_ex(&old_state, oldname, NULL);
oldname = old_state.cwd;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, newname, NULL);
newname = new_state.cwd;
retval = rename(oldname, newname);
CWD_STATE_FREE(&old_state);
CWD_STATE_FREE(&new_state);
return retval;
}
#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
retval = stat(new_state.cwd, buf);
CWD_STATE_FREE(&new_state);
return retval;
}
#else
CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
retval = stat(new_state.cwd, (struct stat*)buf);
CWD_STATE_FREE(&new_state);
return retval;
}
#endif
#if !defined(TSRM_WIN32) && !defined(NETWARE)
CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
retval = lstat(new_state.cwd, buf);
CWD_STATE_FREE(&new_state);
return retval;
}
#endif
CWD_API int virtual_unlink(const char *path TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, path, NULL);
retval = unlink(new_state.cwd);
CWD_STATE_FREE(&new_state);
return retval;
}
CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, pathname, NULL);
#ifdef TSRM_WIN32
retval = mkdir(new_state.cwd);
#else
retval = mkdir(new_state.cwd, mode);
#endif
CWD_STATE_FREE(&new_state);
return retval;
}
CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
{
cwd_state new_state;
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, pathname, NULL);
retval = rmdir(new_state.cwd);
CWD_STATE_FREE(&new_state);
return retval;
}
#ifdef TSRM_WIN32
DIR *opendir(const char *name);
#endif
CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
{
cwd_state new_state;
DIR *retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, pathname, NULL);
retval = opendir(new_state.cwd);
CWD_STATE_FREE(&new_state);
return retval;
}
#ifdef TSRM_WIN32
/* On Windows the trick of prepending "cd cwd; " doesn't work so we need to perform
a real chdir() and mutex it
*/
CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
{
char prev_cwd[MAXPATHLEN];
char *getcwd_result;
FILE *retval;
getcwd_result = getcwd(prev_cwd, MAXPATHLEN);
if (!getcwd_result) {
return NULL;
}
#ifdef ZTS
tsrm_mutex_lock(cwd_mutex);
#endif
chdir(CWDG(cwd).cwd);
retval = popen(command, type);
chdir(prev_cwd);
#ifdef ZTS
tsrm_mutex_unlock(cwd_mutex);
#endif
return retval;
}
#elif defined(NETWARE)
/* On NetWare, the trick of prepending "cd cwd; " doesn't work so we need to perform
a VCWD_CHDIR() and mutex it
*/
CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
{
char prev_cwd[MAXPATHLEN];
char *getcwd_result;
FILE *retval;
getcwd_result = VCWD_GETCWD(prev_cwd, MAXPATHLEN);
if (!getcwd_result) {
return NULL;
}
#ifdef ZTS
tsrm_mutex_lock(cwd_mutex);
#endif
VCWD_CHDIR(CWDG(cwd).cwd);
retval = popen(command, type);
VCWD_CHDIR(prev_cwd);
#ifdef ZTS
tsrm_mutex_unlock(cwd_mutex);
#endif
return retval;
}
#else /* Unix */
CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
{
int command_length;
char *command_line;
char *ptr;
FILE *retval;
command_length = strlen(command);
ptr = command_line = (char *) malloc(command_length + sizeof("cd ; ") + CWDG(cwd).cwd_length+1);
if (!command_line) {
return NULL;
}
memcpy(ptr, "cd ", sizeof("cd ")-1);
ptr += sizeof("cd ")-1;
if (CWDG(cwd).cwd_length == 0) {
*ptr++ = DEFAULT_SLASH;
} else {
memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
ptr += CWDG(cwd).cwd_length;
}
*ptr++ = ' ';
*ptr++ = ';';
*ptr++ = ' ';
memcpy(ptr, command, command_length+1);
retval = popen(command_line, type);
free(command_line);
return retval;
}
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
*/
+241
View File
@@ -0,0 +1,241 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Andi Gutmans <andi@zend.com> |
| Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
#include "TSRM.h"
#include "tsrm_config_common.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
#ifndef TSRM_WIN32
#include <unistd.h>
#endif
#ifdef TSRM_WIN32
#include "readdir.h"
#include <sys/utime.h>
/* mode_t isn't defined on Windows */
typedef unsigned short mode_t;
#define DEFAULT_SLASH '\\'
#define DEFAULT_DIR_SEPARATOR ';'
#define IS_SLASH(c) ((c) == '/' || (c) == '\\')
#define IS_SLASH_P(c) (*(c) == '/' || \
(*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))
#define COPY_WHEN_ABSOLUTE 2
#define IS_ABSOLUTE_PATH(path, len) \
(len >= 2 && isalpha(path[0]) && path[1] == ':')
#define IS_UNC_PATH(path, len) \
(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))
#elif defined(NETWARE)
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
#define DEFAULT_SLASH '/'
#define DEFAULT_DIR_SEPARATOR ';'
#define IS_SLASH(c) ((c) == '/' || (c) == '\\')
#define COPY_WHEN_ABSOLUTE(path) \
(strchr(path, ':') - path + 1) /* Take the volume name which ends with a colon */
#define IS_ABSOLUTE_PATH(path, len) \
(strchr(path, ':') != NULL) /* Colon indicates volume name */
#else
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
#define DEFAULT_SLASH '/'
#ifdef __riscos__
#define DEFAULT_DIR_SEPARATOR ';'
#else
#define DEFAULT_DIR_SEPARATOR ':'
#endif
#define IS_SLASH(c) ((c) == '/')
#define IS_SLASH_P(c) (*(c) == '/')
#endif
#ifndef COPY_WHEN_ABSOLUTE
#define COPY_WHEN_ABSOLUTE 0
#endif
#ifndef IS_ABSOLUTE_PATH
#define IS_ABSOLUTE_PATH(path, len) \
(IS_SLASH(path[0]))
#endif
#ifdef TSRM_EXPORTS
#define CWD_EXPORTS
#endif
#ifdef TSRM_WIN32
# ifdef CWD_EXPORTS
# define CWD_API __declspec(dllexport)
# else
# define CWD_API __declspec(dllimport)
# endif
#else
#define CWD_API
#endif
typedef struct _cwd_state {
char *cwd;
int cwd_length;
} cwd_state;
typedef int (*verify_path_func)(const cwd_state *);
CWD_API void virtual_cwd_startup(void);
CWD_API void virtual_cwd_shutdown(void);
CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC);
CWD_API int virtual_chdir(const char *path TSRMLS_DC);
CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC);
CWD_API int virtual_filepath(const char *path, char **filepath TSRMLS_DC);
CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC);
CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC);
CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
#else
CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
#endif
#if !defined(TSRM_WIN32) && !defined(NETWARE)
CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
#endif
CWD_API int virtual_unlink(const char *path TSRMLS_DC);
CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC);
CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
#if HAVE_UTIME
CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
#endif
CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
#if !defined(TSRM_WIN32) && !defined(NETWARE)
CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC);
#endif
CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path);
typedef struct _virtual_cwd_globals {
cwd_state cwd;
} virtual_cwd_globals;
#ifdef ZTS
# define CWDG(v) TSRMG(cwd_globals_id, virtual_cwd_globals *, v)
#else
# define CWDG(v) (cwd_globals.v)
#endif
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
* virtual_* functions
*/
#ifdef VIRTUAL_DIR
#define VCWD_GETCWD(buff, size) virtual_getcwd(buff, size TSRMLS_CC)
#define VCWD_FOPEN(path, mode) virtual_fopen(path, mode TSRMLS_CC)
/* Because open() has two modes, we have to macros to replace it */
#define VCWD_OPEN(path, flags) virtual_open(path TSRMLS_CC, flags)
#define VCWD_OPEN_MODE(path, flags, mode) virtual_open(path TSRMLS_CC, flags, mode)
#define VCWD_CREAT(path, mode) virtual_creat(path, mode TSRMLS_CC)
#define VCWD_CHDIR(path) virtual_chdir(path TSRMLS_CC)
#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, virtual_chdir TSRMLS_CC)
#define VCWD_GETWD(buf)
#define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
#define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
#define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_LSTAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
#else
#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
#endif
#define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
#define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
#define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
#define VCWD_OPENDIR(pathname) virtual_opendir(pathname TSRMLS_CC)
#define VCWD_POPEN(command, type) virtual_popen(command, type TSRMLS_CC)
#if HAVE_UTIME
#define VCWD_UTIME(path, time) virtual_utime(path, time TSRMLS_CC)
#endif
#define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
#endif
#else
#define VCWD_GETCWD(buff, size) getcwd(buff, size)
#define VCWD_FOPEN(path, mode) fopen(path, mode)
#define VCWD_OPEN(path, flags) open(path, flags)
#define VCWD_OPEN_MODE(path, flags, mode) open(path, flags, mode)
#define VCWD_CREAT(path, mode) creat(path, mode)
#define VCWD_RENAME(oldname, newname) rename(oldname, newname)
#define VCWD_CHDIR(path) chdir(path)
#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
#define VCWD_GETWD(buf) getwd(buf)
#define VCWD_STAT(path, buff) stat(path, buff)
#define VCWD_LSTAT(path, buff) lstat(path, buff)
#define VCWD_UNLINK(path) unlink(path)
#define VCWD_MKDIR(pathname, mode) mkdir(pathname, mode)
#define VCWD_RMDIR(pathname) rmdir(pathname)
#define VCWD_OPENDIR(pathname) opendir(pathname)
#define VCWD_POPEN(command, type) popen(command, type)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
#else
#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
#endif
#if HAVE_UTIME
#define VCWD_UTIME(path, time) utime(path, time)
#endif
#define VCWD_CHMOD(path, mode) chmod(path, mode)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
#endif
#endif
#endif /* VIRTUAL_CWD_H */
+359
View File
@@ -0,0 +1,359 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Daniel Beulshausen <daniel@php4win.de> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <io.h>
#include <process.h>
#include <time.h>
#include "TSRM.h"
#ifdef TSRM_WIN32
#include <windows.h>
#include "tsrm_win32.h"
#ifdef ZTS
static ts_rsrc_id win32_globals_id;
#else
static tsrm_win32_globals win32_globals;
#endif
static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
{
globals->process = NULL;
globals->shm = NULL;
globals->process_size = 0;
globals->shm_size = 0;
globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
}
static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
{
shm_pair *ptr;
if (globals->process) {
free(globals->process);
}
if (globals->shm) {
for (ptr = globals->shm; ptr < (globals->shm + globals->shm_size); ptr++) {
UnmapViewOfFile(ptr->addr);
CloseHandle(ptr->segment);
UnmapViewOfFile(ptr->descriptor);
CloseHandle(ptr->info);
}
free(globals->shm);
}
free(globals->comspec);
}
TSRM_API void tsrm_win32_startup(void)
{
#ifdef ZTS
ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
#else
tsrm_win32_ctor(&win32_globals TSRMLS_CC);
#endif
}
TSRM_API void tsrm_win32_shutdown(void)
{
#ifndef ZTS
tsrm_win32_dtor(&win32_globals TSRMLS_CC);
#endif
}
static process_pair *process_get(FILE *stream TSRMLS_DC)
{
process_pair *ptr;
process_pair *newptr;
for (ptr = TWG(process); ptr < (TWG(process) + TWG(process_size)); ptr++) {
if (ptr->stream == stream) {
break;
}
}
if (ptr < (TWG(process) + TWG(process_size))) {
return ptr;
}
newptr = (process_pair*)realloc((void*)TWG(process), (TWG(process_size)+1)*sizeof(process_pair));
if (newptr == NULL) {
return NULL;
}
TWG(process) = newptr;
ptr = newptr + TWG(process_size);
TWG(process_size)++;
return ptr;
}
static shm_pair *shm_get(int key, void *addr)
{
shm_pair *ptr;
shm_pair *newptr;
TSRMLS_FETCH();
for (ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
if (!ptr->descriptor) {
continue;
}
if (!addr && ptr->descriptor->shm_perm.key == key) {
break;
} else if (ptr->addr == addr) {
break;
}
}
if (ptr < (TWG(shm) + TWG(shm_size))) {
return ptr;
}
newptr = (shm_pair*)realloc((void*)TWG(shm), (TWG(shm_size)+1)*sizeof(shm_pair));
if (newptr == NULL) {
return NULL;
}
TWG(shm) = newptr;
ptr = newptr + TWG(shm_size);
TWG(shm_size)++;
return ptr;
}
static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
HANDLE copy, self = GetCurrentProcess();
if (!DuplicateHandle(self, fh, self, &copy, 0, inherit, DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE)) {
return NULL;
}
return copy;
}
TSRM_API FILE *popen(const char *command, const char *type)
{
FILE *stream = NULL;
int fno, str_len = strlen(type), read, mode;
STARTUPINFO startup;
PROCESS_INFORMATION process;
SECURITY_ATTRIBUTES security;
HANDLE in, out;
char *cmd;
process_pair *proc;
TSRMLS_FETCH();
security.nLength = sizeof(SECURITY_ATTRIBUTES);
security.bInheritHandle = TRUE;
security.lpSecurityDescriptor = NULL;
if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) {
return NULL;
}
memset(&startup, 0, sizeof(STARTUPINFO));
memset(&process, 0, sizeof(PROCESS_INFORMATION));
startup.cb = sizeof(STARTUPINFO);
startup.dwFlags = STARTF_USESTDHANDLES;
startup.hStdError = GetStdHandle(STD_ERROR_HANDLE);
read = (type[0] == 'r') ? TRUE : FALSE;
mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
if (read) {
in = dupHandle(in, FALSE);
startup.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
startup.hStdOutput = out;
} else {
out = dupHandle(out, FALSE);
startup.hStdInput = in;
startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
sprintf(cmd, "%s /c %s", TWG(comspec), command);
if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &process)) {
return NULL;
}
free(cmd);
CloseHandle(process.hThread);
proc = process_get(NULL TSRMLS_CC);
if (read) {
fno = _open_osfhandle((long)in, _O_RDONLY | mode);
CloseHandle(out);
} else {
fno = _open_osfhandle((long)out, _O_WRONLY | mode);
CloseHandle(in);
}
stream = _fdopen(fno, type);
proc->prochnd = process.hProcess;
proc->stream = stream;
return stream;
}
TSRM_API int pclose(FILE *stream)
{
DWORD termstat = 0;
process_pair *process;
TSRMLS_FETCH();
if ((process = process_get(stream TSRMLS_CC)) == NULL) {
return 0;
}
fflush(process->stream);
fclose(process->stream);
WaitForSingleObject(process->prochnd, INFINITE);
GetExitCodeProcess(process->prochnd, &termstat);
process->stream = NULL;
CloseHandle(process->prochnd);
return termstat;
}
TSRM_API int shmget(int key, int size, int flags)
{
shm_pair *shm;
char shm_segment[26], shm_info[29];
HANDLE shm_handle, info_handle;
BOOL created = FALSE;
if (size < 0) {
return -1;
}
sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);
shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
if ((!shm_handle && !info_handle)) {
if (flags & IPC_EXCL) {
return -1;
}
if (flags & IPC_CREAT) {
shm_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, shm_segment);
info_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
created = TRUE;
}
if ((!shm_handle || !info_handle)) {
return -1;
}
}
shm = shm_get(key, NULL);
shm->segment = shm_handle;
shm->info = info_handle;
shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
if (created) {
shm->descriptor->shm_perm.key = key;
shm->descriptor->shm_segsz = size;
shm->descriptor->shm_ctime = time(NULL);
shm->descriptor->shm_cpid = getpid();
shm->descriptor->shm_perm.mode = flags;
shm->descriptor->shm_perm.cuid = shm->descriptor->shm_perm.cgid= 0;
shm->descriptor->shm_perm.gid = shm->descriptor->shm_perm.uid = 0;
shm->descriptor->shm_atime = shm->descriptor->shm_dtime = 0;
shm->descriptor->shm_lpid = shm->descriptor->shm_nattch = 0;
shm->descriptor->shm_perm.mode = shm->descriptor->shm_perm.seq = 0;
}
if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
CloseHandle(shm->segment);
UnmapViewOfFile(shm->descriptor);
CloseHandle(shm->info);
return -1;
}
return key;
}
TSRM_API void *shmat(int key, const void *shmaddr, int flags)
{
shm_pair *shm = shm_get(key, NULL);
if (!shm->segment) {
return (void*)-1;
}
shm->descriptor->shm_atime = time(NULL);
shm->descriptor->shm_lpid = getpid();
shm->descriptor->shm_nattch++;
shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
return shm->addr;
}
TSRM_API int shmdt(const void *shmaddr)
{
shm_pair *shm = shm_get(0, (void*)shmaddr);
if (!shm->segment) {
return -1;
}
shm->descriptor->shm_dtime = time(NULL);
shm->descriptor->shm_lpid = getpid();
shm->descriptor->shm_nattch--;
return UnmapViewOfFile(shm->addr) ? 0 : -1;
}
TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) {
shm_pair *shm = shm_get(key, NULL);
if (!shm->segment) {
return -1;
}
switch (cmd) {
case IPC_STAT:
memcpy(buf, shm->descriptor, sizeof(struct shmid_ds));
return 0;
case IPC_SET:
shm->descriptor->shm_ctime = time(NULL);
shm->descriptor->shm_perm.uid = buf->shm_perm.uid;
shm->descriptor->shm_perm.gid = buf->shm_perm.gid;
shm->descriptor->shm_perm.mode = buf->shm_perm.mode;
return 0;
case IPC_RMID:
if (shm->descriptor->shm_nattch < 1) {
shm->descriptor->shm_perm.key = -1;
}
return 0;
default:
return -1;
}
}
#endif
+107
View File
@@ -0,0 +1,107 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Daniel Beulshausen <daniel@php4win.de> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef TSRM_WIN32_H
#define TSRM_WIN32_H
#include "TSRM.h"
#ifdef TSRM_WIN32
#include <windows.h>
struct ipc_perm {
int key;
unsigned short uid;
unsigned short gid;
unsigned short cuid;
unsigned short cgid;
unsigned short mode;
unsigned short seq;
};
struct shmid_ds {
struct ipc_perm shm_perm;
int shm_segsz;
time_t shm_atime;
time_t shm_dtime;
time_t shm_ctime;
unsigned short shm_cpid;
unsigned short shm_lpid;
short shm_nattch;
};
typedef struct {
FILE *stream;
HANDLE prochnd;
} process_pair;
typedef struct {
void *addr;
HANDLE info;
HANDLE segment;
struct shmid_ds *descriptor;
} shm_pair;
typedef struct {
process_pair *process;
shm_pair *shm;
int process_size;
int shm_size;
char *comspec;
} tsrm_win32_globals;
#ifdef ZTS
# define TWG(v) TSRMG(win32_globals_id, tsrm_win32_globals *, v)
#else
# define TWG(v) (win32_globals.v)
#endif
#endif
#define IPC_PRIVATE 0
#define IPC_CREAT 00001000
#define IPC_EXCL 00002000
#define IPC_NOWAIT 00004000
#define IPC_RMID 0
#define IPC_SET 1
#define IPC_STAT 2
#define IPC_INFO 3
#define SHM_R PAGE_READONLY
#define SHM_W PAGE_READWRITE
#define SHM_RDONLY FILE_MAP_READ
#define SHM_RND FILE_MAP_WRITE
#define SHM_REMAP FILE_MAP_COPY
TSRM_API void tsrm_win32_startup(void);
TSRM_API void tsrm_win32_shutdown(void);
TSRM_API FILE *popen(const char *command, const char *type);
TSRM_API int pclose(FILE *stream);
TSRM_API int shmget(int key, int size, int flags);
TSRM_API void *shmat(int key, const void *shmaddr, int flags);
TSRM_API int shmdt(const void *shmaddr);
TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
#endif
+1
View File
@@ -0,0 +1 @@
/* Leave this file alone */
+1458
View File
File diff suppressed because it is too large. Load diff
+280
View File
@@ -0,0 +1,280 @@
Following is a merge of two letters I sent to php4beta@lists.php.net,
describing the changes in API between PHP 3.0 and PHP 4.0 (Zend).
This file is by no means thorough documentation of the PHP API,
and is intended for developers who are familiar with the PHP 3.0 API,
and want to port their code to PHP 4.0, or take advantage of its new
features. For highlights about the PHP 3.0 API, consult apidoc.txt.
Zeev
--------------------------------------------------------------------------
I'm going to try to list the important changes in API and programming
techniques that are involved in developing modules for PHP4/Zend, as
opposed to PHP3. Listing the whole PHP4 API is way beyond my scope here,
it's mostly a 'diff' from the apidoc.txt, which you're all pretty familiar
with.
An important note that I neglected to mention yesterday - the php4 tree is
based on the php 3.0.5 tree, plus all 3.0.6 patches hand-patched into it.
Notably, it does NOT include any 3.0.7 patches. All of those have to be
reapplied, with extreme care - modules should be safe to patch (mostly),
but anything that touches the core or main.c will almost definitely require
changes in order to work properly.
[1] Symbol Tables
One of the major changes in Zend involves changing the way symbols tables
work. Zend enforces reference counting on all values and resources. This
required changes in the semantics of the hash tables that implement symbol
tables. Instead of storing pval in the hashes, we now store pval *. All
of the API functions in Zend were changed in a way that this change is
completely transparent. However, if you've used 'low level' hash functions
to access or update elements in symbol tables, your code will require
changes. Following are two simple examples, one demonstrates the
difference between PHP3 and Zend when reading a symbol's value, and the
other demonstrates the difference when writing a value.
php3_read()
{
pval *foo;
_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
/* foo->type is the type and foo->value is the value */
}
php4_read()
{
pval **foo;
_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
/* (*foo)->type is the type and (*foo)->value is the value */
}
---
php3_write()
{
pval newval;
newval.type = ...;
newval.value = ...;
_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval), NULL);
}
php4_write()
{
pval *newval = ALLOC_ZVAL();
newval->refcount=1;
newval->is_ref=0;
newval->type = ...;
newval->value = ...;
_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval *), NULL);
}
[2] Resources
One of the 'cute' things about the reference counting support is that it
completely eliminates the problem of resource leaking. A simple loop that
included '$result = mysql_query(...)' in PHP leaked unless the user
remembered to run mysql_free($result) at the end of the loop body, and
nobody really did. In order to take advantage of the automatic resource
deallocation upon destruction, there's virtually one small change you need
to conduct. Change the result type of a resource that you want to destroy
itself as soon as its no longer referenced (just about any resource I can
think of) as IS_RESOURCE, instead of as IS_LONG. The rest is magic.
A special treatment is required for SQL modules that follow MySQL's
approach for having the link handle as an optional argument. Modules that
follow the MySQL module model, store the last opened link in a global
variable, that they use in case the user neglects to explicitly specify a
link handle. Due to the way referenec counting works, this global
reference is just like any other reference, and must increase that SQL link
resource's reference count (otherwise, it will be closed prematurely).
Simply, when you set the default link to a certain link, increase that
link's reference count by calling zend_list_addref().
As always, the MySQL module is the one used to demonstrate 'new
technology'. You can look around it and look for IS_RESOURCE, as well as
zend_list_addref(), to see a clear example of how the new API should be used.
[3] Thread safety issues
I'm not going to say that Zend was designed with thread safety in mind, but
from some point, we've decided upon several guidelines that would make the
move to thread safety much, much easier. Generally, we've followed the PHP
3.1 approach of moving global variables to a structure, and encapsulating
all global variable references within macros. There are three main
differences:
1. We grouped related globals in a single structure, instead of grouping
all globals in one structure.
2. We've used much, much shorter macro names to increase the readability
of the source code.
3. Regardless of whether we're compiling in thread safe mode or not, all
global variables are *always* stored in a structure. For example, you
would never have a global variable 'foo', instead, it'll be a property of a
global structure, for example, compiler_globals.foo. That makes
development much, much easier, since your code will simply not compile
unless you remember to put the necessary macro around foo.
To write code that'll be thread safe in the future (when we release our
thread safe memory manager and work on integrating it), you can take a look
at zend_globals.h. Essentially, two sets of macros are defined, one for
thread safe mode, and one for thread unsafe mode. All global references
are encapsulated within ???G(varname), where ??? is the appropriate prefix
for your structure (for example, so far we have CG(), EG() and AG(), which
stand for the compiler, executor and memory allocator, respectively).
When compiling with thread safety enabled, each function that makes use of
a ???G() macro, must obtain the pointer to its copy of the structure. It
can do so in one of two forms:
1. It can receive it as an argument.
2. It can fetch it.
Obviously, the first method is preferable since it's much quicker.
However, it's not always possible to send the structure all the way to a
particular function, or it may simply bloat the code too much in some
cases. Functions that receive the globals as an argument, should look like
this:
rettype functioname(???LS_D) <-- a function with no arguments
rettype functioname(type arg1, ..., type argn ???LS_DC) <-- a funciton with
arguments
Calls to such functions should look like this:
functionname(???LS_C) <-- a function with no arguments
functionname(arg1, ..., argn ???LS_CC) <-- a function with arguments
LS stands for 'Local Storage', _C stands for Call and _CC stands for Call
Comma, _D stands for Declaration and _DC stands for Declaration Comma.
Note that there's NO comma between the last argument and ???LS_DC or ???LS_CC.
If you do not pass the structure as an argument you can always fetch it by
using the appropriate ???LS_FETCH() macros within a functions variable
declarations.
In general, every module that makes use of globals should use this approach
if it plans to be thread safe.
[4] Generalized INI support
The code comes to solve several issues:
a. The ugly long block of code in main.c that reads values from the
cfg_hash into php3_ini.
b. Get rid of php3_ini. The performance penalty of copying it around all
the time in the Apache module probably wasn't too high, but
psychologically, it annoyed me :)
c. Get rid of the ugly code in mod_php4.c, that also reads values from
Apache directives and puts them into the php3_ini structure.
d. Generalize all the code so that you only have to add an entry in one
single place and get it automatically supported in php3.ini, Apache, Win32
registry, runtime function ini_get() and ini_alter() and any future method
we might have.
e. Allow users to easily override *ANY* php3.ini value, except for ones
they're not supposed to, of course.
I'm happy to say that I think I pretty much reached all goals. php_ini.c
implements a mechanism that lets you add your INI entry in a single place,
with a default value in case there's no php3.ini value. What you get by
using this mechanism:
1. Automatic initialization from php3.ini if available, or from the
default value if not.
2. Automatic support in ini_alter(). That means a user can change the
value for this INI entry at runtime, without you having to add in a single
line of code, and definitely no additional function (for example, in PHP3,
we had to add in special dedicated functions, like
set_magic_quotes_runtime() or the likes - no need for that anymore).
3. Automatic support in Apache .conf files.
4. No need for a global php3_ini-like variable that'll store all that
info. You can directly access each INI entry by name, in runtime. 'Sure,
that's not revolutionary, it's just slow' is probably what some of you
think - which is true, but, you can also register a callback function that
is called each time your INI entry is changed, if you wish to store it in a
cached location for intensive use.
5. Ability to access the current active value for a given INI entry, and
the 'master' value.
Of course, (2) and (3) are only applicable in some cases. Some entries
shouldn't be overriden by users in runtime or through Apache .conf files -
you can, of course, mark them as such.
So, enough hype, how does it work.
Essentially:
static PHP_INI_MH(OnChangeBar); /* declare a message handler for a change
in "bar" */
PHP_INI_BEGIN()
PHP_INI_ENTRY("foo", "1", PHP_INI_ALL, NULL, NULL)
PHP_INI_ENTRY("bar", "bah", PHP_INI_SYSTEM, OnChangeBar, NULL)
PHP_INI_END()
static PHP_INI_MH(OnChangeBar)
{
a_global_var_for_bar = new_value;
return SUCCESS;
}
int whatever_minit(INIT_FUNC_ARGS)
{
...
REGISTER_INI_ENTRIES();
...
}
int whatever_mshutdown(SHUTDOWN_FUNC_ARGS)
{
...
UNREGISTER_INI_ENTRIES();
...
}
and that's it. Here's what it does. As you can probably guess, this code
registers two INI entries - "foo" and "bar". They're given defaults "1"
and "bah" respectively - note that all defaults are always given as
strings. That doesn't reduce your ability to use integer values, simply
specify them as strings. "foo" is marked so that it can be changed by
anyone at any time (PHP_INI_ALL), whereas "bar" is marked so it can be
changed only at startup in the php3.ini only, presumably, by the system
administrator (PHP_INI_SYSTEM).
When "foo" changes, no function is called. Access to it is done using the
macros INI_INT("foo"), INI_FLT("foo") or INI_STR("foo"), which return a
long, double or char * respectively (strings that are returned aren't
duplicated - if they're manipulated, you must duplicate them first). You
can also access the original value (the 'master' value, in case one of them
was overriden by a user) using another pair of macros:
INI_ORIG_INT("foo"), INI_ORIG_FLT("foo") and INI_ORIG_STR("foo").
When "bar" changes, a special message handler is called, OnBarChange().
Always declare those message handlers using PHP_INI_MH(), as they might
change in the future. Message handlers are called as soon as an ini entry
initializes or changes, and allow you to cache a certain INI value in a
quick C structure. In this example, whenever "bar" changes, the new value
is stored in a_global_var_for_bar, which is a global char * pointer,
quickly accessible from other functions. Things get a bit more complicated
when you want to implement a thread-safe module, but it's doable as well.
Message handlers may return SUCCESS to acknowledge the new value, or
FAILURE to reject it. That enables you to reject invalid values for some
INI entries if you want. Finally, you can have a pointer passed to your
message handler - that's the fifth argument to PHP_INI_ENTRY(). It is
passed as mh_arg to the message handler.
Remember that for certain values, there's really no reason to mess with a
callback function. A perfect example for this are the syntax highlight
colors, which no longer have a dedicated global C slot that stores them,
but instead, are fetched from the php_ini hash on demand.
"As always", for a perfect working example of this mechanism, consult
functions/mysql.c. This module uses the new INI entry mechanism, and was
also converted to be thread safe in general, and in its php_ini support in
particular. Converting your modules to look like this for thread safety
isn't a bad idea (not necessarily now, but in the long run).
+492
View File
@@ -0,0 +1,492 @@
PHP Version 3.0 API Documentation
Table of Contents
-----------------
1. Function Prototype
2. Function Arguments
3. Variable number of function arguments
4. Using the function arguments
5. Memory management in functions
6. Setting variables in the symbol table
7. Returning values from functions
8. Returning 'complex' values from functions (arrays or objects)
9. Using the resource list
10. Using the persistent resource table
11. Adding runtime configuration directives
-----------------
1. Function Prototype
All functions look like this:
PHP_FUNCTION(foo) {
}
Even if your function doesn't take any arguments, this is how it is
called.
-----------------
2. Function Arguments
Arguments are always of type pval. This type contains a union which
has the actual type of the argument. So, if your function takes two
arguments, you would do something like the following at the top of your
function:
pval *arg1, *arg2;
if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) {
WRONG_PARAM_COUNT;
}
NOTE: Arguments can be passed either by value or by reference. In both
cases you will need to pass &(pval *) to getParameters. If you want to
check if the n'th parameter was sent to you by reference or not, you can
use the function, ParameterPassedByReference(ht,n). It will return either
1 or 0.
When you change any of the passed parameters, whether they are sent by
reference or by value, you can either start over with the parameter by
calling pval_destructor on it, or if it's an ARRAY you want to add to,
you can use functions similar to the ones in internal_functions.h which
manipulate return_value as an ARRAY.
Also if you change a parameter to IS_STRING make sure you first assign
the new estrdup'ed string and the string length, and only later change the
type to IS_STRING. If you change the string of a parameter which already
IS_STRING or IS_ARRAY you should run pval_destructor on it first.
-----------------
3. Variable number of function arguments
A function can take a variable number of arguments. If your function can
take either 2 or 3 arguments, use the following:
pval *arg1, *arg2, *arg3;
int arg_count = ARG_COUNT(ht);
if (arg_count<2 || arg_count>3 ||
getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) {
WRONG_PARAM_COUNT;
}
------------------
4. Using the function arguments
The type of each argument is stored in the pval type field:
This type can be any of the following:
IS_STRING String
IS_DOUBLE Double-precision floating point
IS_LONG Long
IS_ARRAY Array
IS_EMPTY ??
IS_USER_FUNCTION ??
IS_INTERNAL_FUNCTION ?? (if some of these cannot be passed to a
function - delete)
IS_CLASS ??
IS_OBJECT ??
If you get an argument of one type and would like to use it as another,
or if you just want to force the argument to be of a certain type, you
can use one of the following conversion functions:
convert_to_long(arg1);
convert_to_double(arg1);
convert_to_string(arg1);
convert_to_boolean_long(arg1); If the string is "" or "0" it
becomes 0, 1 otherwise
convert_string_to_number(arg1); Converts string to either LONG or
DOUBLE depending on string
These function all do in-place conversion. They do not return anything.
The actual argument is stored in a union.
For type IS_STRING, use arg1->value.str.val
IS_LONG arg1->value.lval
IS_DOUBLE arg1->value.dval
-------------------
5. Memory management in functions
Any memory needed by a function should be allocated with either emalloc()
or estrdup(). These are memory handling abstraction functions that look
and smell like the normal malloc() and strdup() functions. Memory should
be freed with efree().
There are two kinds of memory in this program. Memory which is returned
to the parser in a variable and memory which you need for temporary
storage in your internal function. When you assign a string to a
variable which is returned to the parser you need to make sure you first
allocate the memory with either emalloc or estrdup. This memory
should NEVER be freed by you, unless you later, in the same function
overwrite your original assignment (this kind of programming practice is
not good though).
For any temporary/permanent memory you need in your functions/library you
should use the three emalloc(), estrdup(), and efree() functions. They
behave EXACTLY like their counterpart functions. Anything you emalloc()
or estrdup() you have to efree() at some point or another, unless it's
supposed to stick around until the end of the program, otherwise there
will be a memory leak. The meaning of "the functions behave exactly like
their counterparts" is if you efree() something which was not
emalloc()'ed nor estrdup()'ed you might get a segmentation fault. So
please take care and free all of your wasted memory. One of the biggest
improvements in PHP 3.0 will hopefully be the memory management.
If you compile with "-DDEBUG", PHP3 will print out a list of all
memory that was allocated using emalloc() and estrdup() but never
freed with efree() when it is done running the specified script.
-------------------
6. Setting variables in the symbol table
A number of macros are available which make it easier to set a variable
in the symbol table:
SET_VAR_STRING(name,value) **
SET_VAR_DOUBLE(name,value)
SET_VAR_LONG(name,value)
** Be careful here. The value part must be malloc'ed manually because
the memory management code will try to free this pointer later. Do
not pass statically allocated memory into a SET_VAR_STRING
Symbol tables in PHP 3.0 are implemented as hash tables. At any given time,
&symbol_table is a pointer to the 'main' symbol table, and active_symbol_table
points to the currently active symbol table (these may be identical like in
startup, or different, if you're inside a function).
The following examples use 'active_symbol_table'. You should replace it with
&symbol_table if you specifically want to work with the 'main' symbol table.
Also, the same funcions may be applied to arrays, as explained below.
* To check whether a variable named $foo already exists in a symbol table:
if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... }
else { doesn't exist }
* If you also need to get the type of the variable, you can use:
hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue);
check(pvalue.type);
Arrays in PHP 3.0 are implemented using the same hashtables as symbol tables.
This means the two above functions can also be used to check variables
inside arrays.
If you want to define a new array in a symbol table, you should do this:
1. Possibly check it exists and abort, using hash_exists()
or hash_find().
2. Code:
pval arr;
if (array_init(&arr) == FAILURE) { failed... };
hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL);
This code declares a new array, named $foo, in the active symbol table.
This array is empty.
Here's how to add new entries to it:
pval entry;
entry.type = IS_LONG;
entry.value.lval = 5;
hash_update(arr.value.ht,"bar",sizeof("bar"),&entry,sizeof(pval),NULL); /* defines $foo["bar"] = 5 */
hash_index_update(arr.value.ht,7,&entry,sizeof(pval),NULL); /* defines $foo[7] = 5 */
hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); /* defines the next free place in $foo[],
* $foo[8], to be 5 (works like php2)
*/
If you'd like to modify a value that you inserted to a hash, you must first retreive it from the hash. To
prevent that overhead, you can supply a pval ** to the hash add function, and it'll be updated with the
pval * address of the inserted element inside the hash. If that value is NULL (like in all of the
above examples) - that parameter is ignored.
hash_next_index_insert() works more or less using the same logic
"$foo[] = bar;" works in PHP 2.0.
If you are building an array to return from a function, you can initialize
the array just like above by doing:
if (array_init(return_value) == FAILURE) { failed...; }
and then adding values with the helper functions:
add_next_index_long(return_value,long_value);
add_next_index_double(return_value,double_value);
add_next_index_string(return_value,estrdup(string_value));
Of course, if the adding isn't done right after the array
initialization, you'd probably have to look for the array first:
pval *arr;
if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { can't find... }
else { use arr->value.ht... }
Note that hash_find receives a pointer to a pval pointer, and
not a pval pointer.
Just about any hash function returns SUCCESS or FAILURE (except for
hash_exists() that returns a boolean truth value).
-------------------
7. Returning 'simple' values from functions (integers, floats or strings)
A number of macros are available to make it easier to return things from
functions:
These set the return value and return from the function:
RETURN_FALSE
RETURN_TRUE
RETURN_LONG(l)
RETURN_STRING(s,dup) If dup is true, duplicates the string
RETURN_STRINGL(s,l,dup) Return string (s) specifying length (l).
RETURN_DOUBLE(d)
These only set the return value:
RETVAL_FALSE
RETVAL_TRUE
RETVAL_LONG(l)
RETVAL_STRING(s,dup) If dup is true, duplicates the string
RETVAL_STRINGL(s,l,dup) Return string (s) specifying length (l).
RETVAL_DOUBLE(d)
The string macros above will all estrdup() the passed 's' argument,
so you can safely free the argument after calling the macro, or
alternatively use statically allocated memory.
If your function returns boolean success/error responses, always use
RETURN_TRUE and RETURN_FALSE respectively.
-------------------
8. Returning 'complex' values from functions (arrays or objects)
Your function can also return a complex data type such as an object
or an array.
Returning an object:
1. Call object_init(return_value).
2. Fill it up with values:
add_property_long(return_value,property_name,l) Add a property named 'property_name', of type long, equals to 'l'
add_property_double(return_value,property_name,d) Same, only a double
add_property_string(return_value,property_name,str) Same, only a string
add_property_stringl(return_value,property_name,str,l) Add a property named 'property_name', of type string, string is 'str' with length 'l'
3. Possibly, register functions for this object. In order to
obtain values from the object, the function would have to fetch
"this" from the active_symbol_table. Its type should be IS_OBJECT,
and it's basically a regular hash table (i.e., you can use regular
hash functions on .value.ht). The actual registration of the
function can be done using:
add_method(return_value,function_name,function_ptr)
Returning an array:
1. Call array_init(return_value).
2. Fill it up with values:
add_assoc_long(return_value,key,l) add associative entry with key 'key' and long value 'l'
add_assoc_double(return_value,key,d)
add_assoc_string(return_value,key,str)
add_assoc_stringl(return_value,key,str,length) specify the string length
add_index_long(return_value,index,l) add entry in index 'index' with long value 'l'
add_index_double(return_value,index,d)
add_index_string(return_value,index,str)
add_index_stringl(return_value,index,str,length) specify the string length
add_next_index_long(return_value,l) add an array entry in the next free offset with long value 'l'
add_next_index_double(return_value,d)
add_next_index_string(return_value,str)
add_next_index_stringl(return_value,str,length) specify the string length
-------------------
9. Using the resource list
PHP 3.0 has a standard way of dealing with various types of resources,
that replaces all of the local linked lists in PHP 2.0.
Available functions:
php3_list_insert(ptr, type) returns the 'id' of the newly inserted resource
php3_list_delete(id) delete the resource with the specified id
php3_list_find(id,*type) returns the pointer of the resource with the specified id, updates 'type' to the resource's type
Typically, these functions are used for SQL drivers but they can be
used for anything else, and are used, for instance, for maintaining
file descriptors.
Typical list code would look like this:
Adding a new resource:
RESOURCE *resource;
...allocate memory for resource and acquire resource...
/* add a new resource to the list */
return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE);
return_value->type = IS_LONG;
Using an existing resource:
pval *resource_id;
RESOURCE *resource;
int type;
convert_to_long(resource_id);
resource = php3_list_find(resource_id->value.lval, &type);
if (type != LE_RESOURCE_TYPE) {
php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval);
RETURN_FALSE;
}
...use resource...
Deleting an existing resource:
pval *resource_id;
RESOURCE *resource;
int type;
convert_to_long(resource_id);
php3_list_delete(resource_id->value.lval);
The resource types should be registered in php3_list.h, in enum
list_entry_type. In addition, one should add shutdown code for any
new resource type defined, in list.c's list_entry_destructor() (even if
you don't have anything to do on shutdown, you must add an empty case).
-------------------
10. Using the persistent resource table
PHP 3.0 has a standard way of storing persistent resources (i.e.,
resources that are kept in between hits). The first module to use
this feature was the MySQL module, and mSQL followed it, so one can
get the general impression of how a persistent resource should be
used by reading mysql.c. The functions you should look at are:
php3_mysql_do_connect()
php3_mysql_connect()
php3_mysql_pconnect()
The general idea of persistence modules is this:
1. Code all of your module to work with the regular resource list
mentioned in section (9).
2. Code extra connect functions that check if the resource already
exists in the persistent resource list. If it does, register it
as in the regular resource list as a pointer to the persistent
resource list (because of 1., the rest of the code
should work immediately). If it doesn't, then create it, add it
to the persistent resource list AND add a pointer to it from the
regular resource list, so all of the code would work since it's
in the regular resource list, but on the next connect, the
resource would be found in the persistent resource list and be
used without having to recreate it.
You should register these resources with a different type (e.g.
LE_MYSQL_LINK for non-persistent link and LE_MYSQL_PLINK for
a persistent link).
If you read mysql.c, you'll notice that except for the more complex
connect function, nothing in the rest of the module has to be changed.
The very same interface exists for the regular resource list and the
persistent resource list, only 'list' is replaced with 'plist':
php3_plist_insert(ptr, type) returns the 'id' of the newly inserted resource
php3_plist_delete(id) delete the resource with the specified id
php3_plist_find(id,*type) returns the pointer of the resource with the specified id, updates 'type' to the resource's type
However, it's more than likely that these functions would prove
to be useless for you when trying to implement a persistent module.
Typically, one would want to use the fact that the persistent resource
list is really a hash table. For instance, in the MySQL/mSQL modules,
when there's a pconnect() call (persistent connect), the function
builds a string out of the host/user/passwd that were passed to the
function, and hashes the SQL link with this string as a key. The next
time someone calls a pconnect() with the same host/user/passwd, the
same key would be generated, and the function would find the SQL link
in the persistent list.
Until further documented, you should look at mysql.c or msql.c to
see how one should use the plist's hash table abilities.
One important thing to note: resources going into the persistent
resource list must *NOT* be allocated with PHP's memory manager, i.e.,
they should NOT be created with emalloc(), estrdup(), etc. Rather,
one should use the regular malloc(), strdup(), etc. The reason for
this is simple - at the end of the request (end of the hit), every
memory chunk that was allocated using PHP's memory manager is deleted.
Since the persistent list isn't supposed to be erased at the end
of a request, one mustn't use PHP's memory manager for allocating
resources that go to it.
Shutting down persistent resources:
When you register resource that's going to be in the persistent list,
you should add destructors to it both in the non-persistent list
and in the persistent list.
The destructor in the non-persistent list destructor shouldn't do anything.
The one in the persistent list destructor should properly free any
resources obtained by that type (e.g. memory, SQL links, etc). Just like
with the non-persistent resources, you *MUST* add destructors for every
resource, even it requires no destructotion and the destructor would
be empty.
Remember, since emalloc() and friends aren't to be used in conjunction
with the persistent list, you mustn't use efree() here either.
-------------------
11. Adding runtime configuration directives
Many of the features of PHP3 can be configured at runtime. These
configuration directives can appear in either the designated php3.ini
file, or in the case of the Apache module version in the Apache .conf
files. The advantage of having them in the Apache .conf files is that
they can be configured on a per-directory basis. This means that one
directory may have a certain safemodeexecdir for example, while another
directory may have another. This configuration granularity is especially
handy when a server supports multiple virtual hosts.
The steps required to add a new directive:
1. Add directive to php3_ini_structure struct in mod_php4.h.
2. In main.c, edit the php3_module_startup function and add the
appropriate cfg_get_string() or cfg_get_long() call.
3. Add the directive, restrictions and a comment to the php3_commands
structure in mod_php4.c. Note the restrictions part. RSRC_CONF are
directives that can only be present in the actual Apache .conf files.
Any OR_OPTIONS directives can be present anywhere, include normal
.htaccess files.
4. In either php3take1handler() or php3flaghandler() add the appropriate
entry for your directive.
5. In the configuration section of the _php3_info() function in
functions/info.c you need to add your new directive.
6. And last, you of course have to use your new directive somewhere.
It will be addressable as php3_ini.directive
+71
View File
@@ -0,0 +1,71 @@
# +----------------------------------------------------------------------+
# | PHP Version 4 |
# +----------------------------------------------------------------------+
# | Copyright (c) 1997-2002 The PHP Group |
# +----------------------------------------------------------------------+
# | This source file is subject to version 2.02 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is |
# | available at through the world-wide-web at |
# | http://www.php.net/license/2_02.txt. |
# | If you did not receive a copy of the PHP license and are unable to |
# | obtain it through the world-wide-web, please send a note to |
# | license@php.net so we can mail you a copy immediately. |
# +----------------------------------------------------------------------+
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
# $Id$
#
#
# Makefile to generate build tools
#
SUBDIRS = Zend TSRM
STAMP = buildmk.stamp
ALWAYS = generated_lists
all: $(STAMP) $(ALWAYS)
@$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
generated_lists:
@echo makefile_am_files = Zend/Makefile.am \
TSRM/Makefile.am > $@
@echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh
@build/buildcheck.sh && touch $(STAMP)
snapshot:
distname='$(DISTNAME)'; \
if test -z "$$distname"; then \
distname='php4-snapshot'; \
fi; \
myname=`basename \`pwd\`` ; \
cd .. && cp -rp $$myname $$distname; \
cd $$distname; \
rm -f $(SUBDIRS) 2>/dev/null || true; \
for i in $(SUBDIRS); do \
test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \
done; \
find . -type l -exec rm {} \; ; \
$(MAKE) AMFLAGS=--copy -f build/build.mk; \
cd ..; \
tar cf $$distname.tar $$distname; \
rm -rf $$distname $$distname.tar.*; \
bzip2 -9 $$distname.tar; \
md5sum $$distname.tar.bz2; \
sync; sleep 2; \
md5sum $$distname.tar.bz2; \
bzip2 -t $$distname.tar.bz2
cvsclean:
@for i in `find . -name .cvsignore`; do \
(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
done
@rm -f $(SUBDIRS) 2>/dev/null || true
.PHONY: $(ALWAYS) snapshot cvsclean
+59
View File
@@ -0,0 +1,59 @@
# +----------------------------------------------------------------------+
# | PHP Version 4 |
# +----------------------------------------------------------------------+
# | Copyright (c) 1997-2002 The PHP Group |
# +----------------------------------------------------------------------+
# | This source file is subject to version 2.02 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is |
# | available at through the world-wide-web at |
# | http://www.php.net/license/2_02.txt. |
# | If you did not receive a copy of the PHP license and are unable to |
# | obtain it through the world-wide-web, please send a note to |
# | license@php.net so we can mail you a copy immediately. |
# +----------------------------------------------------------------------+
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
# $Id$
#
include generated_lists
TOUCH_FILES = mkinstalldirs install-sh missing
LT_TARGETS = ltmain.sh config.guess config.sub
makefile_in_files = $(makefile_am_files:.am=.in)
makefile_files = $(makefile_am_files:e.am=e)
config_h_in = main/php_config.h.in
acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
targets = $(TOUCH_FILES) configure $(config_h_in)
all: $(targets)
acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
cat $(acconfig_h_SOURCES) > $@
SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_PROG_CPP was called before AC_PROG_CC)'||true)
$(config_h_in): configure acconfig.h
# explicitly remove target since autoheader does not seem to work
# correctly otherwise (timestamps are not updated)
@echo rebuilding $@
@rm -f $@
@autoheader 2>&1 | $(SUPPRESS_WARNINGS)
$(TOUCH_FILES):
touch $(TOUCH_FILES)
aclocal.m4: configure.in acinclude.m4
aclocal 2>&1 | $(SUPPRESS_WARNINGS)
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
@autoconf 2>&1 | $(SUPPRESS_WARNINGS)
+93
View File
@@ -0,0 +1,93 @@
#! /bin/sh
# +----------------------------------------------------------------------+
# | PHP Version 4 |
# +----------------------------------------------------------------------+
# | Copyright (c) 1997-2002 The PHP Group |
# +----------------------------------------------------------------------+
# | This source file is subject to version 2.02 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is |
# | available at through the world-wide-web at |
# | http://www.php.net/license/2_02.txt. |
# | If you did not receive a copy of the PHP license and are unable to |
# | obtain it through the world-wide-web, please send a note to |
# | license@php.net so we can mail you a copy immediately. |
# +----------------------------------------------------------------------+
# | Authors: Stig Bakken <ssb@fast.no> |
# | Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
# $Id: buildcheck.sh,v 1.16 2002-03-04 08:28:57 sas Exp $
#
echo "buildconf: checking installation..."
# autoconf 2.13 or newer
ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
if test -z "$ac_version"; then
echo "buildconf: autoconf not found."
echo " You need autoconf version 2.13 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
IFS=.; set $ac_version; IFS=' '
if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
echo "buildconf: autoconf version $ac_version found."
echo " You need autoconf version 2.13 or newer installed"
echo " to build PHP from CVS."
exit 1
else
echo "buildconf: autoconf version $ac_version (ok)"
fi
# automake 1.4 or newer
am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
if test "$am_version" = ""; then
echo "buildconf: automake not found."
echo " You need automake version 1.4 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
IFS=.; set $am_version_clean; IFS=' '
if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then
echo "buildconf: automake version $am_version found."
echo " You need automake version 1.4 or newer installed"
echo " to build PHP from CVS."
exit 1
else
echo "buildconf: automake version $am_version (ok)"
fi
# libtool 1.4 or newer
libtool=`which libtool`
if test ! -f "$libtool"; then libtool=`which glibtool`; fi
lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'`
if test "$lt_pversion" = ""; then
echo "buildconf: libtool not found."
echo " You need libtool version 1.4 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
IFS=.; set $lt_version; IFS=' '
if test "$1" -gt "1" || test "$2" -ge "4";
then
echo "buildconf: libtool version $lt_pversion (ok)"
else
echo "buildconf: libtool version $lt_pversion found."
echo " You need libtool version 1.4 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
lt_prefix=`echo $libtool | sed -e 's#/[^/]*/[^/]*$##'`
if test "$am_prefix" != "$lt_prefix"; then
echo "WARNING: automake and libtool are installed in different"
echo " directories. This may cause aclocal to fail."
echo " continuing anyway"
fi
exit 0
+41
View File
@@ -0,0 +1,41 @@
#! /bin/sh
# $Id: genif.sh,v 1.3 2002-03-22 10:22:41 sas Exp $
# replacement for genif.pl
infile=$1
shift
srcdir=$1
shift
extra_module_ptrs=$1
shift
awk=$1
shift
if test -z "$infile" || test -z "$srcdir"; then
echo "please supply infile and srcdir"
exit 1
fi
module_ptrs=$extra_module_ptrs
header_list=
olddir=`pwd`
cd $srcdir
for ext in ${1+"$@"} ; do
module_ptrs=" phpext_${ext}_ptr,@NEWLINE@$module_ptrs"
header_list="$header_list ext/$ext/*.h"
done
includes=`$awk -f ./build/print_include.awk $header_list`
cd $olddir
cat $infile | \
sed \
-e "s'@EXT_INCLUDE_CODE@'$includes'" \
-e "s'@EXT_MODULE_PTRS@'$module_ptrs'" \
-e 's/@NEWLINE@/\
/g'
+75
View File
@@ -0,0 +1,75 @@
# +----------------------------------------------------------------------+
# | PHP Version 4 |
# +----------------------------------------------------------------------+
# | Copyright (c) 2000 The PHP Group |
# +----------------------------------------------------------------------+
# | This source file is subject to version 2.02 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is |
# | available at through the world-wide-web at |
# | http://www.php.net/license/2_02.txt. |
# | If you did not receive a copy of the PHP license and are unable to |
# | obtain it through the world-wide-web, please send a note to |
# | license@php.net so we can mail you a copy immediately. |
# +----------------------------------------------------------------------+
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
# $Id$
#
# Usage:
#
# echo top_srcdir top_builddir srcdir CPP [CPP-ARGS] filenames | \
# awk -f mkdep.awk > dependencies
{
top_srcdir=$1
top_builddir=$2
srcdir=$3
cmd=$4
for (i = 5; i <= NF; i++) {
if (match($i, "^-[A-Z]") == 0)
break;
cmd=cmd " " $i
}
dif=i-1
for (; i <= NF; i++)
filenames[i-dif]=$i
no_files=NF-dif
for(i = 1; i <= no_files; i++) {
if (system("test -r " filenames[i]) != 0)
continue
target=filenames[i]
sub(srcdir "/", "", target)
target2=target
sub("\.(c|cpp)$", ".lo", target);
sub("\.(c|cpp)$", ".slo", target2);
for (e in used)
delete used[e]
cmdx=cmd " " filenames[i]
done=0
while ((cmdx | getline) > 0) {
if (match($0, "^# [0-9]* \".*\.h\"") != 0) {
if (sub(top_srcdir, "$(top_srcdir)", $3) == 0)
sub(top_builddir, "$(top_builddir)", $3)
if (substr($3,2,1) != "/" && used[$3] != 1) {
if (done == 0)
printf(target " " target2 ":")
done=1
printf(" \\\n\t" substr($3,2,length($3)-2))
used[$3] = 1;
}
}
}
if (done == 1)
print "\n"
}
}
+6
View File
@@ -0,0 +1,6 @@
/phpext_/ {
if (old_filename != FILENAME) {
printf "#include \"" FILENAME "\"@NEWLINE@"
old_filename = FILENAME
}
}
Executable
+787
View File
@@ -0,0 +1,787 @@
#!/bin/sh
##
## GNU shtool -- The GNU Portable Shell Tool
## Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>
##
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
## Version: 1.5.4 (14-Jun-2001)
## Contents: 3/17 available modules
##
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
##
## NOTICE: Given that you include this file verbatim into your own
## source tree, you are justified in saying that it remains separate
## from your package, and that this way you are simply just using GNU
## shtool. So, in this situation, there is no requirement that your
## package itself is licensed under the GNU General Public License in
## order to take advantage of GNU shtool.
##
##
## Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]
##
## Available commands:
## echo Print string with optional construct expansion
## install Install a program, script or datafile
## mkdir Make one or more directories
##
## Not available commands (because module was not built-in):
## mdate Pretty-print modification time of a file or dir
## table Pretty-print a field-separated list as a table
## prop Display progress with a running propeller
## move Move files with simultaneous substitution
## mkln Make link with calculation of relative paths
## mkshadow Make a shadow tree through symbolic links
## fixperm Fix file permissions inside a source tree
## tarball Roll distribution tarballs
## guessos Simple operating system guesser
## arx Extended archive command
## slo Separate linker options by library class
## scpp Sharing C Pre-Processor
## version Maintain a version information file
## path Deal with program paths
##
if [ $# -eq 0 ]; then
echo "$0:Error: invalid command line" 1>&2
echo "$0:Hint: run \`$0 -h' for usage" 1>&2
exit 1
fi
if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
echo "This is GNU shtool, version 1.5.4 (14-Jun-2001)"
echo "Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>"
echo "Report bugs to <bug-shtool@gnu.org>"
echo ''
echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
echo ''
echo 'Available global <options>:'
echo ' -v, --version display shtool version information'
echo ' -h, --help display shtool usage help page (this one)'
echo ' -d, --debug display shell trace information'
echo ' -r, --recreate recreate this shtool script via shtoolize'
echo ''
echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
echo ' echo [-n] [-e] [<str> ...]'
echo ' install [-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>]'
echo ' [-e<sed-cmd>] <file> [<file> ...] <path>'
echo ' mkdir [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
echo ''
echo 'Not available <cmd-name> (because module was not built-in):'
echo ' mdate [-n] [-z] [-s] [-d] [-f<str>] [-o<spec>] <path>'
echo ' table [-F<sep>] [-w<width>] [-c<cols>] [-s<strip>] <str><sep><str>...'
echo ' prop [-p<str>]'
echo ' move [-v] [-t] [-e] [-p] <src-file> <dst-file>'
echo ' mkln [-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>'
echo ' mkshadow [-v] [-t] [-a] <src-dir> <dst-dir>'
echo ' fixperm [-v] [-t] <path> [<path> ...]'
echo ' tarball [-t] [-v] [-o<tarball>] [-c<prog>] [-d<dir>] [-u<user>]'
echo ' [-g<group>] [-e<pattern>] <path> [<path> ...]'
echo ' guessos '
echo ' arx [-t] [-C<cmd>] <op> <archive> [<file> ...]'
echo ' slo [-p<str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]'
echo ' scpp [-v] [-p] [-f<filter>] [-o<ofile>] [-t<tfile>] [-M<mark>]'
echo ' [-D<dname>] [-C<cname>] <file> [<file> ...]'
echo ' version [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-e]'
echo ' [-i<knob>] [-d<type>] <file>'
echo ' path [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]'
echo ''
exit 0
fi
if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
echo "GNU shtool 1.5.4 (14-Jun-2001)"
exit 0
fi
if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
shtoolize -ofoo echo install mkdir
exit 0
fi
if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
shift
set -x
fi
name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'`
case "$name" in
echo|install|mkdir )
# implicit tool command selection
tool="$name"
;;
* )
# explicit tool command selection
tool="$1"
shift
;;
esac
arg_spec=""
opt_spec=""
gen_tmpfile=no
##
## DISPATCH INTO SCRIPT PROLOG
##
case $tool in
echo )
str_tool="echo"
str_usage="[-n] [-e] [<str> ...]"
arg_spec="0+"
opt_spec="n.e."
opt_n=no
opt_e=no
;;
install )
str_tool="install"
str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<sed-cmd>] <file> [<file> ...] <path>"
arg_spec="2+"
opt_spec="v.t.c.C.s.m:o:g:e+"
opt_v=no
opt_t=no
opt_c=no
opt_C=no
opt_s=no
opt_m="0755"
opt_o=""
opt_g=""
opt_e=""
;;
mkdir )
str_tool="mkdir"
str_usage="[-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]"
arg_spec="1+"
opt_spec="t.f.p.m:"
opt_t=no
opt_f=no
opt_p=no
opt_m=""
;;
-* )
echo "$0:Error: unknown option \`$tool'" 2>&1
echo "$0:Hint: run \`$0 -h' for usage" 2>&1
exit 1
;;
* )
echo "$0:Error: unknown command \`$tool'" 2>&1
echo "$0:Hint: run \`$0 -h' for usage" 2>&1
exit 1
;;
esac
##
## COMMON UTILITY CODE
##
# determine name of tool
if [ ".$tool" != . ]; then
# used inside shtool script
toolcmd="$0 $tool"
toolcmdhelp="shtool $tool"
msgprefix="shtool:$tool"
else
# used as standalone script
toolcmd="$0"
toolcmdhelp="sh $0"
msgprefix="$str_tool"
fi
# parse argument specification string
eval `echo $arg_spec |\
sed -e 's/^\([0-9]*\)\([+=]\)/arg_NUMS=\1; arg_MODE=\2/'`
# parse option specification string
eval `echo h.$opt_spec |\
sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'`
# interate over argument line
opt_PREV=''
while [ $# -gt 0 ]; do
# special option stops processing
if [ ".$1" = ".--" ]; then
shift
break
fi
# determine option and argument
opt_ARG_OK=no
if [ ".$opt_PREV" != . ]; then
# merge previous seen option with argument
opt_OPT="$opt_PREV"
opt_ARG="$1"
opt_ARG_OK=yes
opt_PREV=''
else
# split argument into option and argument
case "$1" in
-[a-zA-Z0-9]*)
eval `echo "x$1" |\
sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \
-e 's/";\(.*\)$/"; opt_ARG="\1"/'`
;;
-[a-zA-Z0-9])
opt_OPT=`echo "x$1" | cut -c3-`
opt_ARG=''
;;
*)
break
;;
esac
fi
# eat up option
shift
# determine whether option needs an argument
eval "opt_MODE=\$opt_MODE_${opt_OPT}"
if [ ".$opt_ARG" = . -a ".$opt_ARG_OK" != .yes ]; then
if [ ".$opt_MODE" = ".:" -o ".$opt_MODE" = ".+" ]; then
opt_PREV="$opt_OPT"
continue
fi
fi
# process option
case $opt_MODE in
'.' )
# boolean option
eval "opt_${opt_OPT}=yes"
;;
':' )
# option with argument (multiple occurances override)
eval "opt_${opt_OPT}=\"\$opt_ARG\""
;;
'+' )
# option with argument (multiple occurances append)
eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\""
;;
* )
echo "$msgprefix:Error: unknown option: \`-$opt_OPT'" 1>&2
echo "$msgprefix:Hint: run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
exit 1
;;
esac
done
if [ ".$opt_PREV" != . ]; then
echo "$msgprefix:Error: missing argument to option \`-$opt_PREV'" 1>&2
echo "$msgprefix:Hint: run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
exit 1
fi
# process help option
if [ ".$opt_h" = .yes ]; then
echo "Usage: $toolcmdhelp $str_usage"
exit 0
fi
# complain about incorrect number of arguments
case $arg_MODE in
'=' )
if [ $# -ne $arg_NUMS ]; then
echo "$msgprefix:Error: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2
echo "$msgprefix:Hint: run \`$toolcmd -h' or \`man shtool' for details" 1>&2
exit 1
fi
;;
'+' )
if [ $# -lt $arg_NUMS ]; then
echo "$msgprefix:Error: invalid number of arguments (at least $arg_NUMS expected)" 1>&2
echo "$msgprefix:Hint: run \`$toolcmd -h' or \`man shtool' for details" 1>&2
exit 1
fi
;;
esac
# establish a temporary file on request
if [ ".$gen_tmpfile" = .yes ]; then
if [ ".$TMPDIR" != . ]; then
tmpdir="$TMPDIR"
elif [ ".$TEMPDIR" != . ]; then
tmpdir="$TEMPDIR"
else
tmpdir="/tmp"
fi
tmpfile="$tmpdir/.shtool.$$"
rm -f $tmpfile >/dev/null 2>&1
touch $tmpfile
chmod 600 $tmpfile
fi
##
## DISPATCH INTO SCRIPT BODY
##
case $tool in
echo )
##
## echo -- Print string with optional construct expansion
## Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
## Originally written for WML as buildinfo
##
text="$*"
# check for broken escape sequence expansion
seo=''
bytes=`echo '\1' | wc -c | awk '{ printf("%s", $1); }'`
if [ ".$bytes" != .3 ]; then
bytes=`echo -E '\1' | wc -c | awk '{ printf("%s", $1); }'`
if [ ".$bytes" = .3 ]; then
seo='-E'
fi
fi
# check for existing -n option (to suppress newline)
minusn=''
bytes=`echo -n 123 2>/dev/null | wc -c | awk '{ printf("%s", $1); }'`
if [ ".$bytes" = .3 ]; then
minusn='-n'
fi
# determine terminal bold sequence
term_bold=''
term_norm=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[Bb]'`" != . ]; then
case $TERM in
# for the most important terminal types we directly know the sequences
xterm|xterm*|vt220|vt220*)
term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
;;
vt100|vt100*)
term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
;;
# for all others, we try to use a possibly existing `tput' or `tcout' utility
* )
paths=`echo $PATH | sed -e 's/:/ /g'`
for tool in tput tcout; do
for dir in $paths; do
if [ -r "$dir/$tool" ]; then
for seq in bold md smso; do # 'smso' is last
bold="`$dir/$tool $seq 2>/dev/null`"
if [ ".$bold" != . ]; then
term_bold="$bold"
break
fi
done
if [ ".$term_bold" != . ]; then
for seq in sgr0 me rmso reset; do # 'reset' is last
norm="`$dir/$tool $seq 2>/dev/null`"
if [ ".$norm" != . ]; then
term_norm="$norm"
break
fi
done
fi
break
fi
done
if [ ".$term_bold" != . -a ".$term_norm" != . ]; then
break;
fi
done
;;
esac
if [ ".$term_bold" = . -o ".$term_norm" = . ]; then
echo "$msgprefix:Warning: unable to determine terminal sequence for bold mode" 1>&2
fi
fi
# determine user name
username=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uUgG]'`" != . ]; then
username="$LOGNAME"
if [ ".$username" = . ]; then
username="$USER"
if [ ".$username" = . ]; then
username="`(whoami) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ ".$username" = . ]; then
username="`(who am i) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ ".$username" = . ]; then
username='unknown'
fi
fi
fi
fi
fi
# determine user id
userid=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%U'`" != . ]; then
userid="`(id -u) 2>/dev/null`"
if [ ".$userid" = . ]; then
str="`(id) 2>/dev/null`"
if [ ".`echo $str | grep '^uid[ ]*=[ ]*[0-9]*('`" != . ]; then
userid=`echo $str | sed -e 's/^uid[ ]*=[ ]*//' -e 's/(.*//'`
fi
if [ ".$userid" = . ]; then
userid=`egrep "^${username}:" /etc/passwd 2>/dev/null | \
sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$userid" = . ]; then
userid=`(ypcat passwd) 2>/dev/null |
egrep "^${username}:" | \
sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$userid" = . ]; then
userid='?'
fi
fi
fi
fi
fi
# determine (primary) group id
groupid=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[gG]'`" != . ]; then
groupid=`egrep "^${username}:" /etc/passwd 2>/dev/null | \
sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$groupid" = . ]; then
groupid=`(ypcat passwd) 2>/dev/null | egrep "^${username}:" | \
sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$groupid" = . ]; then
groupid='?'
fi
fi
fi
# determine (primary) group name
groupname=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%g'`" != . ]; then
groupname=`egrep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \
sed -e 's/:.*$//'`
if [ ".$groupname" = . ]; then
groupname=`(ypcat group) 2>/dev/null | \
egrep "^[^:]*:[^:]*:${groupid}:" | \
sed -e 's/:.*$//'`
if [ ".$groupname" = . ]; then
groupname='?'
fi
fi
fi
# determine host and domain name
hostname=''
domainname=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%h'`" != . ]; then
hostname="`(uname -n) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ ".$hostname" = . ]; then
hostname="`(hostname) 2>/dev/null |\
awk '{ printf("%s", $1); }'`"
if [ ".$hostname" = . ]; then
hostname='unknown'
fi
fi
case $hostname in
*.* )
domainname=".`echo $hostname | cut -d. -f2-`"
hostname="`echo $hostname | cut -d. -f1`"
;;
esac
fi
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
if [ ".$domainname" = . ]; then
if [ -f /etc/resolv.conf ]; then
domainname="`egrep '^[ ]*domain' /etc/resolv.conf | head -1 |\
sed -e 's/.*domain//' \
-e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \
-e 's/^\.//' -e 's/^/./' |\
awk '{ printf("%s", $1); }'`"
if [ ".$domainname" = . ]; then
domainname="`egrep '^[ ]*search' /etc/resolv.conf | head -1 |\
sed -e 's/.*search//' \
-e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \
-e 's/ .*//' -e 's/ .*//' \
-e 's/^\.//' -e 's/^/./' |\
awk '{ printf("%s", $1); }'`"
fi
fi
fi
fi
# determine current time
time_day=''
time_month=''
time_year=''
time_monthname=''
if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[DMYm]'`" != . ]; then
time_day=`date '+%d'`
time_month=`date '+%m'`
time_year=`date '+%Y' 2>/dev/null`
if [ ".$time_year" = . ]; then
time_year=`date '+%y'`
case $time_year in
[5-9][0-9]) time_year="19$time_year" ;;
[0-4][0-9]) time_year="20$time_year" ;;
esac
fi
case $time_month in
1|01) time_monthname='Jan' ;;
2|02) time_monthname='Feb' ;;
3|03) time_monthname='Mar' ;;
4|04) time_monthname='Apr' ;;
5|05) time_monthname='May' ;;
6|06) time_monthname='Jun' ;;
7|07) time_monthname='Jul' ;;
8|08) time_monthname='Aug' ;;
9|09) time_monthname='Sep' ;;
10) time_monthname='Oct' ;;
11) time_monthname='Nov' ;;
12) time_monthname='Dec' ;;
esac
fi
# expand special ``%x'' constructs
if [ ".$opt_e" = .yes ]; then
text=`echo $seo "$text" |\
sed -e "s/%B/${term_bold}/g" \
-e "s/%b/${term_norm}/g" \
-e "s/%u/${username}/g" \
-e "s/%U/${userid}/g" \
-e "s/%g/${groupname}/g" \
-e "s/%G/${groupid}/g" \
-e "s/%h/${hostname}/g" \
-e "s/%d/${domainname}/g" \
-e "s/%D/${time_day}/g" \
-e "s/%M/${time_month}/g" \
-e "s/%Y/${time_year}/g" \
-e "s/%m/${time_monthname}/g" 2>/dev/null`
fi
# create output
if [ .$opt_n = .no ]; then
echo $seo "$text"
else
# the harder part: echo -n is best, because
# awk may complain about some \xx sequences.
if [ ".$minusn" != . ]; then
echo $seo $minusn "$text"
else
echo dummy | awk '{ printf("%s", TEXT); }' TEXT="$text"
fi
fi
;;
install )
##
## install -- Install a program, script or datafile
## Copyright (c) 1997-2001 Ralf S. Engelschall <rse@engelschall.com>
## Originally written for shtool
##
# determine source(s) and destination
argc=$#
srcs=""
while [ $# -gt 1 ]; do
srcs="$srcs $1"
shift
done
dstpath="$1"
# type check for destination
dstisdir=0
if [ -d $dstpath ]; then
dstpath=`echo "$dstpath" | sed -e 's:/$::'`
dstisdir=1
fi
# consistency check for destination
if [ $argc -gt 2 -a $dstisdir = 0 ]; then
echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2
exit 1
fi
# iterate over all source(s)
for src in $srcs; do
dst=$dstpath
# if destination is a directory, append the input filename
if [ $dstisdir = 1 ]; then
dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
dst="$dst/$dstfile"
fi
# check for correct arguments
if [ ".$src" = ".$dst" ]; then
echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2
continue
fi
if [ -d "$src" ]; then
echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2
continue
fi
# make a temp file name in the destination directory
dsttmp=`echo $dst |\
sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \
-e "s;\$;/#INST@$$#;"`
# verbosity
if [ ".$opt_v" = .yes ]; then
echo "$src -> $dst" 1>&2
fi
# copy or move the file name to the temp name
# (because we might be not allowed to change the source)
if [ ".$opt_C" = .yes ]; then
opt_c=yes
fi
if [ ".$opt_c" = .yes ]; then
if [ ".$opt_t" = .yes ]; then
echo "cp $src $dsttmp" 1>&2
fi
cp $src $dsttmp || exit $?
else
if [ ".$opt_t" = .yes ]; then
echo "mv $src $dsttmp" 1>&2
fi
mv $src $dsttmp || exit $?
fi
# adjust the target file
if [ ".$opt_e" != . ]; then
sed='sed'
for e in $opt_e; do
sed="$sed -e '$e'"
done
cp $dsttmp $dsttmp.old
eval "$sed <$dsttmp.old >$dsttmp" || exit $?
rm -f $dsttmp.old
fi
if [ ".$opt_s" = .yes ]; then
if [ ".$opt_t" = .yes ]; then
echo "strip $dsttmp" 1>&2
fi
strip $dsttmp || exit $?
fi
if [ ".$opt_o" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chown $opt_o $dsttmp" 1>&2
fi
chown $opt_o $dsttmp || exit $?
fi
if [ ".$opt_g" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chgrp $opt_g $dsttmp" 1>&2
fi
chgrp $opt_g $dsttmp || exit $?
fi
if [ ".$opt_m" != ".-" ]; then
if [ ".$opt_t" = .yes ]; then
echo "chmod $opt_m $dsttmp" 1>&2
fi
chmod $opt_m $dsttmp || exit $?
fi
# determine whether to do a quick install
# (has to be done _after_ the strip was already done)
quick=no
if [ ".$opt_C" = .yes ]; then
if [ -r $dst ]; then
if cmp -s $src $dst; then
quick=yes
fi
fi
fi
# finally, install the file to the real destination
if [ $quick = yes ]; then
if [ ".$opt_t" = .yes ]; then
echo "rm -f $dsttmp" 1>&2
fi
rm -f $dsttmp
else
if [ ".$opt_t" = .yes ]; then
echo "rm -f $dst && mv $dsttmp $dst" 1>&2
fi
rm -f $dst && mv $dsttmp $dst
fi
done
;;
mkdir )
##
## mkdir -- Make one or more directories
## Copyright (c) 1996-2001 Ralf S. Engelschall <rse@engelschall.com>
## Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
## Cleaned up and enhanced for shtool
##
errstatus=0
for p in ${1+"$@"}; do
# if the directory already exists...
if [ -d "$p" ]; then
if [ ".$opt_f" = .no -a ".$opt_p" = .no ]; then
echo "$msgprefix:Error: directory already exists: $p" 1>&2
errstatus=1
break
else
continue
fi
fi
# if the directory has to be created...
if [ ".$opt_p" = .no ]; then
if [ ".$opt_t" = .yes ]; then
echo "mkdir $p" 1>&2
fi
mkdir $p || errstatus=$?
if [ ".$opt_m" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chmod $opt_m $p" 1>&2
fi
chmod $opt_m $p || errstatus=$?
fi
else
# the smart situation
set fnord `echo ":$p" |\
sed -e 's/^:\//%/' \
-e 's/^://' \
-e 's/\// /g' \
-e 's/^%/\//'`
shift
pathcomp=''
for d in ${1+"$@"}; do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp="./$pathcomp" ;;
esac
if [ ! -d "$pathcomp" ]; then
if [ ".$opt_t" = .yes ]; then
echo "mkdir $pathcomp" 1>&2
fi
mkdir $pathcomp || errstatus=$?
if [ ".$opt_m" != . ]; then
if [ ".$opt_t" = .yes ]; then
echo "chmod $opt_m $pathcomp" 1>&2
fi
chmod $opt_m $pathcomp || errstatus=$?
fi
fi
pathcomp="$pathcomp/"
done
fi
done
exit $errstatus
;;
esac
exit 0
##EOF##
Executable
+36
View File
@@ -0,0 +1,36 @@
#!/bin/sh
# $Id$
supplied_flag=$1
if test "$supplied_flag" = "--copy"; then
automake_flags=--copy
fi
## build.mk does not check aclocal exit status yet
##
#mv aclocal.m4 aclocal.m4.old 2>/dev/null
#aclocal
#if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then
# echo "buildconf: ERROR: aclocal failed, probably because automake and"
# echo " libtool are installed with different prefixes;"
# echo " automake is installed in $am_prefix, but libtool in $lt_prefix."
# echo " Please re-install automake and/or libtool with a common prefix"
# echo " and try again."
# exit 1
#fi
if test "$supplied_flag" = "--local"; then
subdirs='SUBDIRS='
else
subdirs=''
fi
rm -f generated_lists
case "`uname`" in
*BSD/OS*)
./build/bsd_makefile;;
esac
${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
+1308
View File
File diff suppressed because it is too large. Load diff
Vendored
+1417
View File
File diff suppressed because it is too large. Load diff
+1312
View File
File diff suppressed because it is too large. Load diff
Executable
+3
View File
@@ -0,0 +1,3 @@
#! /bin/sh
${MAKE:-make} -f build/build.mk cvsclean
+2
View File
@@ -0,0 +1,2 @@
aspell
Rasmus Lerdorf
+228
View File
@@ -0,0 +1,228 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#ifdef COMPILE_DL_ASPELL
#include "phpdl.h"
#endif
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#if HAVE_ASPELL
#include "php_aspell.h"
#include <aspell-c.h>
#include "ext/standard/info.h"
/* {{{ aspell_functions[]
*/
function_entry aspell_functions[] = {
PHP_FE(aspell_new, NULL)
PHP_FE(aspell_check, NULL)
PHP_FE(aspell_check_raw, NULL)
PHP_FE(aspell_suggest, NULL)
{NULL, NULL, NULL}
};
/* }}} */
static int le_aspell;
zend_module_entry aspell_module_entry = {
STANDARD_MODULE_HEADER,
"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_ASPELL
ZEND_GET_MODULE(aspell)
#endif
/* {{{ php_aspell_close
*/
static void php_aspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
aspell *sc = (aspell *)rsrc->ptr;
aspell_free(sc);
}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(aspell)
{
le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number);
return SUCCESS;
}
/* }}} */
/* {{{ proto int aspell_new(string master [, string personal])
Load a dictionary */
PHP_FUNCTION(aspell_new)
{
pval **master, **personal;
int argc;
aspell *sc;
int ind;
argc = ZEND_NUM_ARGS();
if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &master, &personal) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(master);
if(argc==2)
{
convert_to_string_ex(personal) ;
sc=aspell_new(Z_STRVAL_PP(master), Z_STRVAL_PP(personal));
}
else
sc=aspell_new(Z_STRVAL_PP(master), "");
ind = zend_list_insert(sc, le_aspell);
RETURN_LONG(ind);
}
/* }}} */
/* {{{ proto array aspell_suggest(aspell int, string word)
Return array of Suggestions */
PHP_FUNCTION(aspell_suggest)
{
pval **scin, **word;
int argc;
aspell *sc;
int ind, type;
aspellSuggestions *sug;
size_t i;
argc = ZEND_NUM_ARGS();
if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scin);
convert_to_string_ex(word);
sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
if(!sc)
{
php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
RETURN_FALSE;
}
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
}
sug = aspell_suggest(sc, Z_STRVAL_PP(word));
for (i = 0; i != sug->size; ++i) {
add_next_index_string(return_value, (char *)sug->data[i], 1);
}
aspell_free_suggestions(sug);
}
/* }}} */
/* {{{ proto int aspell_check(aspell int, string word)
Return if word is valid */
PHP_FUNCTION(aspell_check)
{
int type;
pval **scin, **word;
aspell *sc;
int argc;
argc = ZEND_NUM_ARGS();
if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scin);
convert_to_string_ex(word);
sc= (aspell *) zend_list_find(Z_LVAL_PP(scin), &type);
if(!sc)
{
php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
RETURN_FALSE;
}
if (aspell_check(sc, Z_STRVAL_PP(word)))
{
RETURN_TRUE;
}
else
{
RETURN_FALSE;
}
}
/* }}} */
/* {{{ proto int aspell_check_raw(aspell int, string word)
Return if word is valid, ignoring case or trying to trim it in any way */
PHP_FUNCTION(aspell_check_raw)
{
pval **scin, **word;
int type;
int argc;
aspell *sc;
argc = ZEND_NUM_ARGS();
if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scin);
convert_to_string_ex(word);
sc = (aspell *)zend_list_find(Z_LVAL_PP(scin), &type);
if(!sc)
{
php_error(E_WARNING, "%d is not an ASPELL result index", Z_LVAL_PP(scin));
RETURN_FALSE;
}
if (aspell_check_raw(sc, Z_STRVAL_PP(word)))
{
RETURN_TRUE;
}
else
{
RETURN_FALSE;
}
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION
*/
PHP_MINFO_FUNCTION(aspell)
{
php_info_print_table_start();
php_info_print_table_row(2, "ASpell Support", "enabled");
php_info_print_table_end();
}
/* }}} */
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
+30
View File
@@ -0,0 +1,30 @@
dnl
dnl $Id$
dnl
AC_MSG_CHECKING(for ASPELL support)
AC_ARG_WITH(aspell,
[ --with-aspell[=DIR] Include ASPELL support.],
[
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
ASPELL_DIR=/usr/local
else
ASPELL_DIR=$withval
fi
PHP_ADD_INCLUDE($ASPELL_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib)
if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then
AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include)
fi
AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
AC_MSG_RESULT(yes)
PHP_NEW_EXTENSION(aspell, aspell.c)
else
AC_MSG_RESULT(no)
fi
],[
AC_MSG_RESULT(no)
])
+41
View File
@@ -0,0 +1,41 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef PHP_ASPELL_H
#define PHP_ASPELL_H
#if HAVE_ASPELL
extern zend_module_entry aspell_module_entry;
#define aspell_module_ptr &aspell_module_entry
PHP_MINIT_FUNCTION(aspell);
PHP_MINFO_FUNCTION(aspell);
PHP_FUNCTION(aspell_new);
PHP_FUNCTION(aspell_check);
PHP_FUNCTION(aspell_check_raw);
PHP_FUNCTION(aspell_suggest);
#else
#define aspell_module_ptr NULL
#endif
#define phpext_aspell_ptr aspell_module_ptr
#endif /* PHP_ASPELL_H */
+2
View File
@@ -0,0 +1,2 @@
BC Math
Andi Gutmans
+506
View File
@@ -0,0 +1,506 @@
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2002 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Andi Gutmans <andi@zend.com> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "php.h"
#if WITH_BCMATH
#include "ext/standard/info.h"
#include "php_bcmath.h"
#include "ext/bcmath/libbcmath/src/bcmath.h"
function_entry bcmath_functions[] = {
PHP_FE(bcadd, NULL)
PHP_FE(bcsub, NULL)
PHP_FE(bcmul, NULL)
PHP_FE(bcdiv, NULL)
PHP_FE(bcmod, NULL)
PHP_FE(bcpow, NULL)
PHP_FE(bcsqrt, NULL)
PHP_FE(bcscale, NULL)
PHP_FE(bccomp, NULL)
{NULL, NULL, NULL}
};
zend_module_entry bcmath_module_entry = {
STANDARD_MODULE_HEADER,
"bcmath",
bcmath_functions,
PHP_MINIT(bcmath),
PHP_MSHUTDOWN(bcmath),
PHP_RINIT(bcmath),
NULL,
PHP_MINFO(bcmath),
NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
#ifdef COMPILE_DL_BCMATH
ZEND_GET_MODULE(bcmath)
#endif
#ifndef THREAD_SAFE
static long bc_precision;
#endif
/* Storage used for special numbers. */
bc_num _zero_;
bc_num _one_;
bc_num _two_;
/* Make a copy of a number! Just increments the reference count! */
bc_num copy_num (bc_num num)
{
num->n_refs++;
return num;
}
/* Initialize a number NUM by making it a copy of zero. */
void init_num (bc_num *num)
{
*num = copy_num (_zero_);
}
PHP_MINIT_FUNCTION(bcmath)
{
extern bc_num _zero_;
extern bc_num _one_;
extern bc_num _two_;
_zero_ = bc_new_num (1, 0);
_one_ = bc_new_num (1, 0);
_one_->n_value[0] = 1;
_two_ = bc_new_num (1, 0);
_two_->n_value[0] = 2;
persist_alloc(_zero_);
persist_alloc(_one_);
persist_alloc(_two_);
persist_alloc(_zero_->n_ptr);
persist_alloc(_one_->n_ptr);
persist_alloc(_two_->n_ptr);
return SUCCESS;
}
PHP_MSHUTDOWN_FUNCTION(bcmath)
{
bc_free_num(&_zero_);
bc_free_num(&_one_);
bc_free_num(&_two_);
return SUCCESS;
}
PHP_RINIT_FUNCTION(bcmath)
{
if (cfg_get_long("bcmath.scale", &bc_precision)==FAILURE) {
bc_precision=0;
}
return SUCCESS;
}
PHP_MINFO_FUNCTION(bcmath)
{
php_info_print_table_start();
php_info_print_table_row(2, "BCMath support", "enabled");
php_info_print_table_end();
}
/* {{{ proto string bcadd(string left_operand, string right_operand [, int scale])
Returns the sum of two arbitrary precision numbers */
PHP_FUNCTION(bcadd)
{
pval **left, **right, **scale_param;
bc_num first, second, result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
bc_add (first, second, &result, scale);
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcsub(string left_operand, string right_operand [, int scale])
Returns the difference between two arbitrary precision numbers */
PHP_FUNCTION(bcsub)
{
pval **left, **right, **scale_param;
bc_num first, second, result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
bc_sub (first, second, &result, scale);
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcmul(string left_operand, string right_operand [, int scale])
Returns the multiplication of two arbitrary precision numbers */
PHP_FUNCTION(bcmul)
{
pval **left, **right, **scale_param;
bc_num first, second, result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
bc_multiply (first, second, &result, scale);
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale])
Returns the quotient of two arbitrary precision numbers (division) */
PHP_FUNCTION(bcdiv)
{
pval **left, **right, **scale_param;
bc_num first, second, result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
switch (bc_divide (first, second, &result, scale)) {
case 0: /* OK */
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
break;
case -1: /* division by zero */
php_error(E_WARNING, "Division by zero");
break;
}
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcmod(string left_operand, string right_operand)
Returns the modulus of the two arbitrary precision operands */
PHP_FUNCTION(bcmod)
{
pval **left, **right;
bc_num first, second, result;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), 0);
bc_str2num(&second, Z_STRVAL_PP(right), 0);
switch (bc_modulo(first, second, &result, 0)) {
case 0:
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
break;
case -1:
php_error(E_WARNING, "Division by zero");
break;
}
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcpow(string x, string y [, int scale])
Returns the value of an arbitrary precision number raised to the power of another */
PHP_FUNCTION(bcpow)
{
pval **left, **right, **scale_param;
bc_num first, second, result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_init_num(&result);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
bc_raise (first, second, &result, scale);
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bcsqrt(string operand [, int scale])
Returns the square root of an arbitray precision number */
PHP_FUNCTION(bcsqrt)
{
pval **left, **scale_param;
bc_num result;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, &left)== FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 2:
if (zend_get_parameters_ex(2, &left, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
bc_init_num(&result);
bc_str2num(&result, Z_STRVAL_PP(left), scale);
if (bc_sqrt (&result, scale) != 0) {
Z_STRVAL_P(return_value) = bc_num2str(result);
Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
} else {
php_error(E_WARNING, "Square root of negative number");
}
bc_free_num(&result);
return;
}
/* }}} */
/* {{{ proto string bccomp(string left_operand, string right_operand [, int scale])
Compares two arbitrary precision numbers */
PHP_FUNCTION(bccomp)
{
pval **left, **right, **scale_param;
bc_num first, second;
int scale=bc_precision;
switch (ZEND_NUM_ARGS()) {
case 2:
if (zend_get_parameters_ex(2, &left, &right) == FAILURE) {
WRONG_PARAM_COUNT;
}
break;
case 3:
if (zend_get_parameters_ex(3, &left, &right, &scale_param) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(scale_param);
scale = (int) Z_LVAL_PP(scale_param);
break;
default:
WRONG_PARAM_COUNT;
break;
}
convert_to_string_ex(left);
convert_to_string_ex(right);
bc_init_num(&first);
bc_init_num(&second);
bc_str2num(&first, Z_STRVAL_PP(left), scale);
bc_str2num(&second, Z_STRVAL_PP(right), scale);
Z_LVAL_P(return_value) = bc_compare(first, second);
Z_TYPE_P(return_value) = IS_LONG;
bc_free_num(&first);
bc_free_num(&second);
return;
}
/* }}} */
/* {{{ proto string bcscale(int scale)
Sets default scale parameter for all bc math functions */
PHP_FUNCTION(bcscale)
{
pval **new_scale;
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &new_scale)==FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(new_scale);
bc_precision = Z_LVAL_PP(new_scale);
RETURN_TRUE;
}
/* }}} */
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
+17
View File
@@ -0,0 +1,17 @@
dnl
dnl $Id$
dnl
PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
[ --enable-bcmath Enable bc style precision math functions.])
if test "$PHP_BCMATH" != "no"; then
AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
libbcmath/src/rmzero.c libbcmath/src/str2num.c,
$ext_shared,,-I@ext_srcdir@/libbcmath/src)
PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src)
fi
+3
View File
@@ -0,0 +1,3 @@
Phil Nelson <philnelson@acm.org> wrote bcmath library.
+515
View File
@@ -0,0 +1,515 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
^L
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
^L
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
^L
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
^L
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
^L
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
^L
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply, and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License
may add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
^L
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
^L
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms
of the ordinary General Public License).
To apply these terms, attach the following notices to the library.
It is safest to attach them to the start of each source file to most
effectively convey the exclusion of warranty; and each file should
have at least the "copyright" line and a pointer to where the full
notice is found.
<one line to give the library's name and a brief idea of what it
does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper
mail.
You should also get your employer (if you work as a programmer) or
your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James
Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
+10
View File
@@ -0,0 +1,10 @@
Wed Jun 7 09:39:02 2000 Phil Nelson <phil@cs.wwu.edu>
* configure.in and many others: version number now at 0.2.
Many other changes/additions for getting a distribution
to work.
2000-05-21 Phil Nelson <phil@cs.wwu.edu>
* Initial setup of bcmath library., calling it version 0.1.
+21
View File
@@ -0,0 +1,21 @@
BCMATH FAQ:
1) Why BCMATH?
The math routines of GNU bc become more generally useful in a
library form. By separating the BCMATH library from GNU bc,
GNU bc can be under the GPL and BCMATH can be under the LGPL.
2) Why BCMATH when GMP exists?
GMP has "integers" (no digits after a decimal), "rational numbers"
(stored as 2 integers) and "floats". None of these will correctly
represent a POSIX BC number. Floats are the closest, but will not
behave correctly for many computations. For example, BC numbers have
a "scale" that represent the number of digits to represent after the
decimal point. The multiplying two of these numbers requires one to
calculate an exact number of digits after the decimal point regardless
of the number of digits in the integer part. GMP floats have a
"fixed, but arbitrary" mantissa and so multiplying two floats will end
up dropping digits BC must calculate.
+9
View File
@@ -0,0 +1,9 @@
Currently, only libbcmath.a is built. To build and install it, do
configure
make
make install
Typical configure parameters are available. (e.g. PREFIX)
Bugs and comments to philnelson@acm.org.
+12
View File
@@ -0,0 +1,12 @@
## Process this file with automake to produce Makefile.in
SUBDIRS= src doc
MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
stamp-h.in *~
dist-hook:
cp $(srcdir)/doc/bcmath.1 $(distdir)/doc
cp $(srcdir)/src/private.h $(distdir)/src
cp $(srcdir)/FAQ $(distdir)
+3
View File
@@ -0,0 +1,3 @@
NEWS for bcmath library:
May 2000: The library is created.
+9
View File
@@ -0,0 +1,9 @@
This is bcmath, a library of arbitrary precision math routines.
These routines, in a different form, are the routines that to
the arbitrary precision calculations for GNU bc and GNU dc.
This library is provided to make these routines useful in a
larger context with less restrictions on the use of them.
These routines do not duplicate functionality of the GNU gmp
library. gmp is similar, but the actual computation is different.
+9
View File
@@ -0,0 +1,9 @@
/* PACKAGE name */
#undef PACKAGE
/* Package VERSION number */
#undef VERSION
/* Define to `size_t' if <sys/types.h> and <stddef.h> don't define. */
#undef ptrdiff_t
+127
View File
@@ -0,0 +1,127 @@
dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
# serial 1
dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
AC_SUBST(VERSION)
dnl test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
ifelse([$3],,
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
AC_REQUIRE([AM_SANITY_CHECK])
AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])])
#
# Check to make sure that the build environment is sane.
#
AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
if test "[$]*" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
if test "[$]*" != "X $srcdir/configure conftestfile" \
&& test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi
test "[$]2" = conftestfile
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
rm -f conftest*
AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if ($2 --version) < /dev/null > /dev/null 2>&1; then
$1=$2
AC_MSG_RESULT(found)
else
$1="$3/missing $2"
AC_MSG_RESULT(missing)
fi
AC_SUBST($1)])
# Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.
dnl This file resides in the same directory as the config header
dnl that is generated. We must strip everything past the first ":",
dnl and everything past the last "/".
AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
<<am_indx=1
for am_file in <<$1>>; do
case " <<$>>CONFIG_HEADERS " in
*" <<$>>am_file "*<<)>>
echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
;;
esac
am_indx=`expr "<<$>>am_indx" + 1`
done<<>>dnl>>)
changequote([,]))])
+41
View File
@@ -0,0 +1,41 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
/* Define to empty if the keyword does not work. */
#undef const
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to `size_t' if <sys/types.h> and <stddef.h> don't define. */
#undef ptrdiff_t
/* Define if you have the <lib.h> header file. */
#undef HAVE_LIB_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
/* Define if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
/* Version number of package */
#undef VERSION
+1859
View File
File diff suppressed because it is too large. Load diff
+18
View File
@@ -0,0 +1,18 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(doc/bcmath.1)
AM_INIT_AUTOMAKE("bcmath", "0.2")
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_CHECK_HEADERS(stdarg.h stddef.h stdlib.h string.h limits.h unistd.h lib.h)
AC_C_CONST
AC_TYPE_SIZE_T
AC_CHECK_TYPE(ptrdiff_t, size_t)
AC_OUTPUT(Makefile src/Makefile doc/Makefile)
+238
View File
@@ -0,0 +1,238 @@
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
#
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
tranformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
-s) stripcmd="$stripprog"
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
shift
continue;;
*) if [ x"$src" = x ]
then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done
if [ x"$src" = x ]
then
echo "install: no input file specified"
exit 1
else
true
fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
if [ -d $dst ]; then
instcmd=:
else
instcmd=mkdir
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
then
true
else
echo "install: $src does not exist"
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi
## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}"
shift
if [ ! -d "${pathcomp}" ] ;
then
$mkdirprog "${pathcomp}"
else
true
fi
pathcomp="${pathcomp}/"
done
fi
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
# If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
true
fi
# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
$doit $instcmd $src $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
exit 0
+134
View File
@@ -0,0 +1,134 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
case "$1" in
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
automake touch all \`Makefile.in' files
bison touch file \`y.tab.c'
makeinfo touch the output file
yacc touch file \`y.tab.c'"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing - GNU libit 0.0"
;;
-*)
echo 1>&2 "$0: Unknown \`$1' option"
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
you modified \`acinclude.m4' or \`configure.in'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
you modified \`configure.in'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
you modified \`acconfig.h' or \`configure.in'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
touch config.h.in
;;
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print \
| sed 's/^\(.*\).am$/touch \1.in/' \
| sh
;;
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
your modified any \`.y' file. For being effective, your
modifications might require the \`Bison' package. Grab it from
any GNU archive site."
touch y.tab.c
;;
makeinfo)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. It should be needed only if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
fi
touch $file
;;
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac
exit 0
+36
View File
@@ -0,0 +1,36 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Last modified: 1994-03-25
# Public domain
errstatus=0
for file in ${1+"$@"} ; do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d in ${1+"$@"} ; do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" 1>&2
mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
fi
if test ! -d "$pathcomp"; then
errstatus=$lasterr
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# mkinstalldirs ends here
+22
View File
@@ -0,0 +1,22 @@
# Makefile for bcmath library
lib_LIBRARIES = libbcmath.a
include_HEADERS = bcmath.h
libbcmath_a_SOURCES= add.c compare.c debug.c div.c divmod.c doaddsub.c \
init.c int2num.c nearzero.c neg.c num2long.c num2str.c output.c \
raise.c raisemod.c recmul.c rmzero.c sqrt.c str2num.c sub.c zero.c \
outofmem.c rt.c
INCLUDES = -I$(srcdir) -I..
CFLAGS = @CFLAGS@
CPPFLAGS = $(INCLUDES) -Wall
MAINTAINERCLEANFILES= Makefile.in $(libbcmath_a_SOURCES) private.h bcmath.h
all: $(bin_LIBRARIES)
clean:
rm -f $(OBJS) $(LIB) *~
+88
View File
@@ -0,0 +1,88 @@
/* add.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Here is the full add routine that takes care of negative numbers.
N1 is added to N2 and the result placed into RESULT. SCALE_MIN
is the minimum scale for the result. */
void
bc_add (n1, n2, result, scale_min)
bc_num n1, n2, *result;
int scale_min;
{
bc_num sum = NULL;
int cmp_res;
int res_scale;
if (n1->n_sign == n2->n_sign)
{
sum = _bc_do_add (n1, n2, scale_min);
sum->n_sign = n1->n_sign;
}
else
{
/* subtraction must be done. */
cmp_res = _bc_do_compare (n1, n2, FALSE, FALSE); /* Compare magnitudes. */
switch (cmp_res)
{
case -1:
/* n1 is less than n2, subtract n1 from n2. */
sum = _bc_do_sub (n2, n1, scale_min);
sum->n_sign = n2->n_sign;
break;
case 0:
/* They are equal! return zero with the correct scale! */
res_scale = MAX (scale_min, MAX(n1->n_scale, n2->n_scale));
sum = bc_new_num (1, res_scale);
memset (sum->n_value, 0, res_scale+1);
break;
case 1:
/* n2 is less than n1, subtract n2 from n1. */
sum = _bc_do_sub (n1, n2, scale_min);
sum->n_sign = n1->n_sign;
}
}
/* Clean up and return. */
bc_free_num (result);
*result = sum;
}
+158
View File
@@ -0,0 +1,158 @@
/* bcmath.h: bcmath library header. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#ifndef _BCMATH_H_
#define _BCMATH_H_
typedef enum {PLUS, MINUS} sign;
typedef struct bc_struct *bc_num;
typedef struct bc_struct
{
sign n_sign;
int n_len; /* The number of digits before the decimal point. */
int n_scale; /* The number of digits after the decimal point. */
int n_refs; /* The number of pointers to this number. */
bc_num n_next; /* Linked list for available list. */
char *n_ptr; /* The pointer to the actual storage.
If NULL, n_value points to the inside of
another number (bc_multiply...) and should
not be "freed." */
char *n_value; /* The number. Not zero char terminated.
May not point to the same place as n_ptr as
in the case of leading zeros generated. */
} bc_struct;
/* The base used in storing the numbers in n_value above.
Currently this MUST be 10. */
#define BASE 10
/* Some useful macros and constants. */
#define CH_VAL(c) (c - '0')
#define BCD_CHAR(d) (d + '0')
#ifdef MIN
#undef MIN
#undef MAX
#endif
#define MAX(a, b) ((a)>(b)?(a):(b))
#define MIN(a, b) ((a)>(b)?(b):(a))
#define ODD(a) ((a)&1)
#ifndef TRUE
#define TRUE 1
#define FALSE 0
#endif
#ifndef LONG_MAX
#define LONG_MAX 0x7ffffff
#endif
/* Global numbers. */
extern bc_num _zero_;
extern bc_num _one_;
extern bc_num _two_;
/* Function Prototypes */
/* Define the _PROTOTYPE macro if it is needed. */
#ifndef _PROTOTYPE
#ifdef __STDC__
#define _PROTOTYPE(func, args) func args
#else
#define _PROTOTYPE(func, args) func()
#endif
#endif
_PROTOTYPE(void bc_init_numbers, (void));
_PROTOTYPE(bc_num bc_new_num, (int length, int scale));
_PROTOTYPE(void bc_free_num, (bc_num *num));
_PROTOTYPE(bc_num bc_copy_num, (bc_num num));
_PROTOTYPE(void bc_init_num, (bc_num *num));
_PROTOTYPE(void bc_str2num, (bc_num *num, char *str, int scale));
_PROTOTYPE(char *bc_num2str, (bc_num num));
_PROTOTYPE(void bc_int2num, (bc_num *num, int val));
_PROTOTYPE(long bc_num2long, (bc_num num));
_PROTOTYPE(int bc_compare, (bc_num n1, bc_num n2));
_PROTOTYPE(char bc_is_zero, (bc_num num));
_PROTOTYPE(char bc_is_near_zero, (bc_num num, int scale));
_PROTOTYPE(char bc_is_neg, (bc_num num));
_PROTOTYPE(void bc_add, (bc_num n1, bc_num n2, bc_num *result, int scale_min));
_PROTOTYPE(void bc_sub, (bc_num n1, bc_num n2, bc_num *result, int scale_min));
_PROTOTYPE(void bc_multiply, (bc_num n1, bc_num n2, bc_num *prod, int scale));
_PROTOTYPE(int bc_divide, (bc_num n1, bc_num n2, bc_num *quot, int scale));
_PROTOTYPE(int bc_modulo, (bc_num num1, bc_num num2, bc_num *result,
int scale));
_PROTOTYPE(int bc_divmod, (bc_num num1, bc_num num2, bc_num *quot,
bc_num *rem, int scale));
_PROTOTYPE(int bc_raisemod, (bc_num base, bc_num expo, bc_num mod,
bc_num *result, int scale));
_PROTOTYPE(void bc_raise, (bc_num num1, bc_num num2, bc_num *result,
int scale));
_PROTOTYPE(int bc_sqrt, (bc_num *num, int scale));
_PROTOTYPE(void bc_out_num, (bc_num num, int o_base, void (* out_char)(int),
int leading_zero));
/* Prototypes needed for external utility routines. */
_PROTOTYPE(void bc_rt_warn, (char *mesg ,...));
_PROTOTYPE(void bc_rt_error, (char *mesg ,...));
_PROTOTYPE(void bc_out_of_memory, (void));
#endif
+161
View File
@@ -0,0 +1,161 @@
/* compare.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Compare two bc numbers. Return value is 0 if equal, -1 if N1 is less
than N2 and +1 if N1 is greater than N2. If USE_SIGN is false, just
compare the magnitudes. */
int
_bc_do_compare (n1, n2, use_sign, ignore_last)
bc_num n1, n2;
int use_sign;
int ignore_last;
{
char *n1ptr, *n2ptr;
int count;
/* First, compare signs. */
if (use_sign && n1->n_sign != n2->n_sign)
{
if (n1->n_sign == PLUS)
return (1); /* Positive N1 > Negative N2 */
else
return (-1); /* Negative N1 < Positive N1 */
}
/* Now compare the magnitude. */
if (n1->n_len != n2->n_len)
{
if (n1->n_len > n2->n_len)
{
/* Magnitude of n1 > n2. */
if (!use_sign || n1->n_sign == PLUS)
return (1);
else
return (-1);
}
else
{
/* Magnitude of n1 < n2. */
if (!use_sign || n1->n_sign == PLUS)
return (-1);
else
return (1);
}
}
/* If we get here, they have the same number of integer digits.
check the integer part and the equal length part of the fraction. */
count = n1->n_len + MIN (n1->n_scale, n2->n_scale);
n1ptr = n1->n_value;
n2ptr = n2->n_value;
while ((count > 0) && (*n1ptr == *n2ptr))
{
n1ptr++;
n2ptr++;
count--;
}
if (ignore_last && count == 1 && n1->n_scale == n2->n_scale)
return (0);
if (count != 0)
{
if (*n1ptr > *n2ptr)
{
/* Magnitude of n1 > n2. */
if (!use_sign || n1->n_sign == PLUS)
return (1);
else
return (-1);
}
else
{
/* Magnitude of n1 < n2. */
if (!use_sign || n1->n_sign == PLUS)
return (-1);
else
return (1);
}
}
/* They are equal up to the last part of the equal part of the fraction. */
if (n1->n_scale != n2->n_scale)
{
if (n1->n_scale > n2->n_scale)
{
for (count = n1->n_scale-n2->n_scale; count>0; count--)
if (*n1ptr++ != 0)
{
/* Magnitude of n1 > n2. */
if (!use_sign || n1->n_sign == PLUS)
return (1);
else
return (-1);
}
}
else
{
for (count = n2->n_scale-n1->n_scale; count>0; count--)
if (*n2ptr++ != 0)
{
/* Magnitude of n1 < n2. */
if (!use_sign || n1->n_sign == PLUS)
return (-1);
else
return (1);
}
}
}
/* They must be equal! */
return (0);
}
/* This is the "user callable" routine to compare numbers N1 and N2. */
int
bc_compare (n1, n2)
bc_num n1, n2;
{
return _bc_do_compare (n1, n2, TRUE, FALSE);
}
+9
View File
@@ -0,0 +1,9 @@
#if PHP_WIN32
#include "../../../../main/config.w32.h"
#else
#include "php_config.h"
#endif
#include <string.h>
#include "zend.h"
#include "zend_alloc.h"
+70
View File
@@ -0,0 +1,70 @@
/* debug.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* pn prints the number NUM in base 10. */
static void
out_char (int c)
{
putchar(c);
}
void
pn (num)
bc_num num;
{
bc_out_num (num, 10, out_char, 0);
out_char ('\n');
}
/* pv prints a character array as if it was a string of bcd digits. */
void
pv (name, num, len)
char *name;
unsigned char *num;
int len;
{
int i;
printf ("%s=", name);
for (i=0; i<len; i++) printf ("%c",BCD_CHAR(num[i]));
printf ("\n");
}
+276
View File
@@ -0,0 +1,276 @@
/* div.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Some utility routines for the divide: First a one digit multiply.
NUM (with SIZE digits) is multiplied by DIGIT and the result is
placed into RESULT. It is written so that NUM and RESULT can be
the same pointers. */
static void
_one_mult (num, size, digit, result)
unsigned char *num;
int size, digit;
unsigned char *result;
{
int carry, value;
unsigned char *nptr, *rptr;
if (digit == 0)
memset (result, 0, size);
else
{
if (digit == 1)
memcpy (result, num, size);
else
{
/* Initialize */
nptr = (unsigned char *) (num+size-1);
rptr = (unsigned char *) (result+size-1);
carry = 0;
while (size-- > 0)
{
value = *nptr-- * digit + carry;
*rptr-- = value % BASE;
carry = value / BASE;
}
if (carry != 0) *rptr = carry;
}
}
}
/* The full division routine. This computes N1 / N2. It returns
0 if the division is ok and the result is in QUOT. The number of
digits after the decimal point is SCALE. It returns -1 if division
by zero is tried. The algorithm is found in Knuth Vol 2. p237. */
int
bc_divide (n1, n2, quot, scale)
bc_num n1, n2, *quot;
int scale;
{
bc_num qval;
unsigned char *num1, *num2;
unsigned char *ptr1, *ptr2, *n2ptr, *qptr;
int scale1, val;
unsigned int len1, len2, scale2, qdigits, extra, count;
unsigned int qdig, qguess, borrow, carry;
unsigned char *mval;
char zero;
unsigned int norm;
/* Test for divide by zero. */
if (bc_is_zero (n2)) return -1;
/* Test for divide by 1. If it is we must truncate. */
if (n2->n_scale == 0)
{
if (n2->n_len == 1 && *n2->n_value == 1)
{
qval = bc_new_num (n1->n_len, scale);
qval->n_sign = (n1->n_sign == n2->n_sign ? PLUS : MINUS);
memset (&qval->n_value[n1->n_len],0,scale);
memcpy (qval->n_value, n1->n_value,
n1->n_len + MIN(n1->n_scale,scale));
bc_free_num (quot);
*quot = qval;
}
}
/* Set up the divide. Move the decimal point on n1 by n2's scale.
Remember, zeros on the end of num2 are wasted effort for dividing. */
scale2 = n2->n_scale;
n2ptr = (unsigned char *) n2->n_value+n2->n_len+scale2-1;
while ((scale2 > 0) && (*n2ptr-- == 0)) scale2--;
len1 = n1->n_len + scale2;
scale1 = n1->n_scale - scale2;
if (scale1 < scale)
extra = scale - scale1;
else
extra = 0;
num1 = (unsigned char *) emalloc (n1->n_len+n1->n_scale+extra+2);
if (num1 == NULL) bc_out_of_memory();
memset (num1, 0, n1->n_len+n1->n_scale+extra+2);
memcpy (num1+1, n1->n_value, n1->n_len+n1->n_scale);
len2 = n2->n_len + scale2;
num2 = (unsigned char *) emalloc (len2+1);
if (num2 == NULL) bc_out_of_memory();
memcpy (num2, n2->n_value, len2);
*(num2+len2) = 0;
n2ptr = num2;
while (*n2ptr == 0)
{
n2ptr++;
len2--;
}
/* Calculate the number of quotient digits. */
if (len2 > len1+scale)
{
qdigits = scale+1;
zero = TRUE;
}
else
{
zero = FALSE;
if (len2>len1)
qdigits = scale+1; /* One for the zero integer part. */
else
qdigits = len1-len2+scale+1;
}
/* Allocate and zero the storage for the quotient. */
qval = bc_new_num (qdigits-scale,scale);
memset (qval->n_value, 0, qdigits);
/* Allocate storage for the temporary storage mval. */
mval = (unsigned char *) emalloc (len2+1);
if (mval == NULL) bc_out_of_memory ();
/* Now for the full divide algorithm. */
if (!zero)
{
/* Normalize */
norm = 10 / ((int)*n2ptr + 1);
if (norm != 1)
{
_one_mult (num1, len1+scale1+extra+1, norm, num1);
_one_mult (n2ptr, len2, norm, n2ptr);
}
/* Initialize divide loop. */
qdig = 0;
if (len2 > len1)
qptr = (unsigned char *) qval->n_value+len2-len1;
else
qptr = (unsigned char *) qval->n_value;
/* Loop */
while (qdig <= len1+scale-len2)
{
/* Calculate the quotient digit guess. */
if (*n2ptr == num1[qdig])
qguess = 9;
else
qguess = (num1[qdig]*10 + num1[qdig+1]) / *n2ptr;
/* Test qguess. */
if (n2ptr[1]*qguess >
(num1[qdig]*10 + num1[qdig+1] - *n2ptr*qguess)*10
+ num1[qdig+2])
{
qguess--;
/* And again. */
if (n2ptr[1]*qguess >
(num1[qdig]*10 + num1[qdig+1] - *n2ptr*qguess)*10
+ num1[qdig+2])
qguess--;
}
/* Multiply and subtract. */
borrow = 0;
if (qguess != 0)
{
*mval = 0;
_one_mult (n2ptr, len2, qguess, mval+1);
ptr1 = (unsigned char *) num1+qdig+len2;
ptr2 = (unsigned char *) mval+len2;
for (count = 0; count < len2+1; count++)
{
val = (int) *ptr1 - (int) *ptr2-- - borrow;
if (val < 0)
{
val += 10;
borrow = 1;
}
else
borrow = 0;
*ptr1-- = val;
}
}
/* Test for negative result. */
if (borrow == 1)
{
qguess--;
ptr1 = (unsigned char *) num1+qdig+len2;
ptr2 = (unsigned char *) n2ptr+len2-1;
carry = 0;
for (count = 0; count < len2; count++)
{
val = (int) *ptr1 + (int) *ptr2-- + carry;
if (val > 9)
{
val -= 10;
carry = 1;
}
else
carry = 0;
*ptr1-- = val;
}
if (carry == 1) *ptr1 = (*ptr1 + 1) % 10;
}
/* We now know the quotient digit. */
*qptr++ = qguess;
qdig++;
}
}
/* Clean up and return the number. */
qval->n_sign = ( n1->n_sign == n2->n_sign ? PLUS : MINUS );
if (bc_is_zero (qval)) qval->n_sign = PLUS;
_bc_rm_leading_zeros (qval);
bc_free_num (quot);
*quot = qval;
/* Clean up temporary storage. */
efree (mval);
efree (num1);
efree (num2);
return 0; /* Everything is OK. */
}
+91
View File
@@ -0,0 +1,91 @@
/* divmod.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Division *and* modulo for numbers. This computes both NUM1 / NUM2 and
NUM1 % NUM2 and puts the results in QUOT and REM, except that if QUOT
is NULL then that store will be omitted.
*/
int
bc_divmod (num1, num2, quot, rem, scale)
bc_num num1, num2, *quot, *rem;
int scale;
{
bc_num quotient = NULL;
bc_num temp;
int rscale;
/* Check for correct numbers. */
if (bc_is_zero (num2)) return -1;
/* Calculate final scale. */
rscale = MAX (num1->n_scale, num2->n_scale+scale);
bc_init_num(&temp);
/* Calculate it. */
bc_divide (num1, num2, &temp, scale);
if (quot)
quotient = bc_copy_num (temp);
bc_multiply (temp, num2, &temp, rscale);
bc_sub (num1, temp, rem, rscale);
bc_free_num (&temp);
if (quot)
{
bc_free_num (quot);
*quot = quotient;
}
return 0; /* Everything is OK. */
}
/* Modulo for numbers. This computes NUM1 % NUM2 and puts the
result in RESULT. */
int
bc_modulo (num1, num2, result, scale)
bc_num num1, num2, *result;
int scale;
{
return bc_divmod (num1, num2, NULL, result, scale);
}
+232
View File
@@ -0,0 +1,232 @@
/* doaddsub.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Perform addition: N1 is added to N2 and the value is
returned. The signs of N1 and N2 are ignored.
SCALE_MIN is to set the minimum scale of the result. */
bc_num
_bc_do_add (n1, n2, scale_min)
bc_num n1, n2;
int scale_min;
{
bc_num sum;
int sum_scale, sum_digits;
char *n1ptr, *n2ptr, *sumptr;
int carry, n1bytes, n2bytes;
int count;
/* Prepare sum. */
sum_scale = MAX (n1->n_scale, n2->n_scale);
sum_digits = MAX (n1->n_len, n2->n_len) + 1;
sum = bc_new_num (sum_digits, MAX(sum_scale, scale_min));
/* Zero extra digits made by scale_min. */
if (scale_min > sum_scale)
{
sumptr = (char *) (sum->n_value + sum_scale + sum_digits);
for (count = scale_min - sum_scale; count > 0; count--)
*sumptr++ = 0;
}
/* Start with the fraction part. Initialize the pointers. */
n1bytes = n1->n_scale;
n2bytes = n2->n_scale;
n1ptr = (char *) (n1->n_value + n1->n_len + n1bytes - 1);
n2ptr = (char *) (n2->n_value + n2->n_len + n2bytes - 1);
sumptr = (char *) (sum->n_value + sum_scale + sum_digits - 1);
/* Add the fraction part. First copy the longer fraction.*/
if (n1bytes != n2bytes)
{
if (n1bytes > n2bytes)
while (n1bytes>n2bytes)
{ *sumptr-- = *n1ptr--; n1bytes--;}
else
while (n2bytes>n1bytes)
{ *sumptr-- = *n2ptr--; n2bytes--;}
}
/* Now add the remaining fraction part and equal size integer parts. */
n1bytes += n1->n_len;
n2bytes += n2->n_len;
carry = 0;
while ((n1bytes > 0) && (n2bytes > 0))
{
*sumptr = *n1ptr-- + *n2ptr-- + carry;
if (*sumptr > (BASE-1))
{
carry = 1;
*sumptr -= BASE;
}
else
carry = 0;
sumptr--;
n1bytes--;
n2bytes--;
}
/* Now add carry the longer integer part. */
if (n1bytes == 0)
{ n1bytes = n2bytes; n1ptr = n2ptr; }
while (n1bytes-- > 0)
{
*sumptr = *n1ptr-- + carry;
if (*sumptr > (BASE-1))
{
carry = 1;
*sumptr -= BASE;
}
else
carry = 0;
sumptr--;
}
/* Set final carry. */
if (carry == 1)
*sumptr += 1;
/* Adjust sum and return. */
_bc_rm_leading_zeros (sum);
return sum;
}
/* Perform subtraction: N2 is subtracted from N1 and the value is
returned. The signs of N1 and N2 are ignored. Also, N1 is
assumed to be larger than N2. SCALE_MIN is the minimum scale
of the result. */
bc_num
_bc_do_sub (n1, n2, scale_min)
bc_num n1, n2;
int scale_min;
{
bc_num diff;
int diff_scale, diff_len;
int min_scale, min_len;
char *n1ptr, *n2ptr, *diffptr;
int borrow, count, val;
/* Allocate temporary storage. */
diff_len = MAX (n1->n_len, n2->n_len);
diff_scale = MAX (n1->n_scale, n2->n_scale);
min_len = MIN (n1->n_len, n2->n_len);
min_scale = MIN (n1->n_scale, n2->n_scale);
diff = bc_new_num (diff_len, MAX(diff_scale, scale_min));
/* Zero extra digits made by scale_min. */
if (scale_min > diff_scale)
{
diffptr = (char *) (diff->n_value + diff_len + diff_scale);
for (count = scale_min - diff_scale; count > 0; count--)
*diffptr++ = 0;
}
/* Initialize the subtract. */
n1ptr = (char *) (n1->n_value + n1->n_len + n1->n_scale -1);
n2ptr = (char *) (n2->n_value + n2->n_len + n2->n_scale -1);
diffptr = (char *) (diff->n_value + diff_len + diff_scale -1);
/* Subtract the numbers. */
borrow = 0;
/* Take care of the longer scaled number. */
if (n1->n_scale != min_scale)
{
/* n1 has the longer scale */
for (count = n1->n_scale - min_scale; count > 0; count--)
*diffptr-- = *n1ptr--;
}
else
{
/* n2 has the longer scale */
for (count = n2->n_scale - min_scale; count > 0; count--)
{
val = - *n2ptr-- - borrow;
if (val < 0)
{
val += BASE;
borrow = 1;
}
else
borrow = 0;
*diffptr-- = val;
}
}
/* Now do the equal length scale and integer parts. */
for (count = 0; count < min_len + min_scale; count++)
{
val = *n1ptr-- - *n2ptr-- - borrow;
if (val < 0)
{
val += BASE;
borrow = 1;
}
else
borrow = 0;
*diffptr-- = val;
}
/* If n1 has more digits then n2, we now do that subtract. */
if (diff_len != min_len)
{
for (count = diff_len - min_len; count > 0; count--)
{
val = *n1ptr-- - borrow;
if (val < 0)
{
val += BASE;
borrow = 1;
}
else
borrow = 0;
*diffptr-- = val;
}
}
/* Clean up and return. */
_bc_rm_leading_zeros (diff);
return diff;
}
+135
View File
@@ -0,0 +1,135 @@
/* init.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Storage used for special numbers. */
bc_num _zero_;
bc_num _one_;
bc_num _two_;
bc_num _bc_Free_list = NULL;
/* new_num allocates a number and sets fields to known values. */
bc_num
bc_new_num (length, scale)
int length, scale;
{
bc_num temp;
/* PHP Change: malloc() -> emalloc(), removed free_list code */
temp = (bc_num) emalloc (sizeof(bc_struct)+length+scale);
#if 0
if (_bc_Free_list != NULL) {
temp = _bc_Free_list;
_bc_Free_list = temp->n_next;
} else {
temp = (bc_num) emalloc (sizeof(bc_struct));
if (temp == NULL) bc_out_of_memory ();
}
#endif
temp->n_sign = PLUS;
temp->n_len = length;
temp->n_scale = scale;
temp->n_refs = 1;
/* PHP Change: malloc() -> emalloc() */
temp->n_ptr = (char *) emalloc (length+scale);
if (temp->n_ptr == NULL) bc_out_of_memory();
temp->n_value = temp->n_ptr;
memset (temp->n_ptr, 0, length+scale);
return temp;
}
/* "Frees" a bc_num NUM. Actually decreases reference count and only
frees the storage if reference count is zero. */
void
bc_free_num (num)
bc_num *num;
{
if (*num == NULL) return;
(*num)->n_refs--;
if ((*num)->n_refs == 0) {
if ((*num)->n_ptr)
/* PHP Change: free() -> efree(), removed free_list code */
efree ((*num)->n_ptr);
efree(*num);
#if 0
(*num)->n_next = _bc_Free_list;
_bc_Free_list = *num;
#endif
}
*num = NULL;
}
/* Intitialize the number package! */
void
bc_init_numbers ()
{
_zero_ = bc_new_num (1,0);
_one_ = bc_new_num (1,0);
_one_->n_value[0] = 1;
_two_ = bc_new_num (1,0);
_two_->n_value[0] = 2;
}
/* Make a copy of a number! Just increments the reference count! */
bc_num
bc_copy_num (num)
bc_num num;
{
num->n_refs++;
return num;
}
/* Initialize a number NUM by making it a copy of zero. */
void
bc_init_num (num)
bc_num *num;
{
*num = bc_copy_num (_zero_);
}
+84
View File
@@ -0,0 +1,84 @@
/* int2num.c: bcmath library file. */
/*
Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
Copyright (C) 2000 Philip A. Nelson
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. (COPYING.LIB)
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place, Suite 330
Boston, MA 02111-1307 USA.
You may contact the author by:
e-mail: philnelson@acm.org
us-mail: Philip A. Nelson
Computer Science Department, 9062
Western Washington University
Bellingham, WA 98226-9062
*************************************************************************/
#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include "bcmath.h"
#include "private.h"
/* Convert an integer VAL to a bc number NUM. */
void
bc_int2num (num, val)
bc_num *num;
int val;
{
char buffer[30];
char *bptr, *vptr;
int ix = 1;
char neg = 0;
/* Sign. */
if (val < 0)
{
neg = 1;
val = -val;
}
/* Get things going. */
bptr = buffer;
*bptr++ = val % BASE;
val = val / BASE;
/* Extract remaining digits. */
while (val != 0)
{
*bptr++ = val % BASE;
val = val / BASE;
ix++; /* Count the digits. */
}
/* Make the number. */
bc_free_num (num);
*num = bc_new_num (ix, 0);
if (neg) (*num)->n_sign = MINUS;
/* Assign the digits. */
vptr = (*num)->n_value;
while (ix-- > 0)
*vptr++ = *--bptr;
}
Loaded 100 of 1918 files, more files were not shown because too many files have changed in this diff. Show more