summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* * lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.ocean2005-11-081-1/+1
| | | | | | | [ruby-dev:27560] [ruby-core:4627] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]ocean2005-11-061-1/+1
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * eval.c (rb_call_super): should call method_missing if super ismatz2005-11-011-0/+1
| | | | | | | | | | called from Kernel method. * eval.c (exec_under): frame during eval should preserve external information. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/webrick/httpservlet/cgihandler.rbgotoyuzo2005-10-302-0/+30
| | | | | | | | | | | | | | (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie: header field should be splited into each cookie. [ruby-Bugs:2199] * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method to parse the value of Set-Cookie: header field. * test/webrick/test_cookie.rb, test/webrick/test_cgi.rb, test/webrick/webrick.cgi: add some test for cookie. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 1.8.3 preview1matz2005-10-281-1/+1
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * string.c (scan_once): wrong condition to use mbclen2().matz2005-10-272-14/+209
| | | | | | | [ruby-dev:27535] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/rational.rb: applied documentation patch from Gavin Sinclairmatz2005-10-253-71/+250
| | | | | | | | | | <gsinclair@gmail.com>. [ruby-core:06364] * lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines in irb auto-indentation mode. [ruby-core:06358] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):nobu2005-10-241-2/+1
| | | | | | | reduce redundant backtrack. [ruby-talk:161771] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* RDoc documentation from Eric Hodel <Drbrain@segment7.net> added.seki2005-10-243-92/+443
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extensionnobu2005-10-221-4/+18
| | | | | | | options. [ruby-dev:27449] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mkmf.rb (create_makefile): Borland make seems not to allowocean2005-10-201-2/+2
| | | | | | | | empty dependency list. If this change is not good, please correct it. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mkmf.rb (create_makefile): get rid of a restrictionnobu2005-10-191-1/+2
| | | | | | | of Borland make. fixed: [ruby-dev:27460] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mkmf.rb (create_makefile): do not create unnecessary emptynobu2005-10-191-3/+2
| | | | | | | directories. fixed: [ruby-dev:27451] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* check remote hash tupleseki2005-10-161-1/+5
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.gotoyuzo2005-10-141-1/+1
| | | | | | | | It is harmful to permit the access to ~/public_html by default. suggested by Hiroyuki Iwatsuki. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices maymatz2005-10-071-1/+1
| | | | | | | | | | not be parsed correctly. A patch from August Z. Flatby (augustzf) in [ruby-Patches-2595]. [ruby-core:06183] * pack.c (EXTEND16): [ruby-dev:27383] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount thegotoyuzo2005-10-041-1/+1
| | | | | | | servlet on "/". git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong callgotoyuzo2005-10-041-1/+1
| | | | | | | of "join". git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/delegate.rb: document update from James Edward Gray IImatz2005-09-282-0/+2
| | | | | | | <james@grayproductions.net>. [ruby-core:06027] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string shouldgotoyuzo2005-09-282-2/+3
| | | | | | | | | | refer the value of QUERY_STRING. [ruby-list:41186] * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=): add new method. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.nobu2005-09-273-41/+51
| | | | | | | | | | | [ruby-dev:27237], [ruby-core:05854] * lib/yaml/tag.rb (Module#yaml_as): suppress warnings. * lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * eval.c (set_trace_func): add rb_secure(4) to prevent addingmatz2005-09-263-46/+321
| | | | | | | | | | tracing function. * lib/delegate.rb: document update from James Edward Gray II <james@grayproductions.net>. [ruby-core:05942] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* *** empty log message ***nobu2005-09-261-10/+14
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/optparse.rb (RequiredArgument#parse): not consume unmatchednobu2005-09-251-15/+11
| | | | | | | argument. fixed [ruby-dev:27316] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/fileutils.rb (cd): no longer accept :noop option, related code is ↵aamine2005-09-231-1/+1
| | | | | | useless (backported from trunk, rev 1.67). [ruby-core:05858] [ruby-Bugs:2494] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose, DryRun ↵aamine2005-09-231-0/+20
| | | | | | | | | | | (backported from trunk, rev 1.66). [ruby-core:05954] * test/fileutils/test_nowrite.rb: test it. * test/fileutils/test_dryrun.rb: new file. * test/fileutils/test_verbose.rb: new file. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mkmf.rb (find_executable0): default path if environment is notnobu2005-09-221-1/+10
| | | | | | | set. [ruby-dev:27281] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mkmf.rb (configuration): generalized nmake dependent code.nobu2005-09-211-1/+7
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/optparse.rb (default_argv, Arguable#options): defaults stringsnobu2005-09-201-3/+9
| | | | | | | to be parsed to Arguable instance. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/yaml.rb: require 'yaml/constants'. [ruby-core:5776]matz2005-09-201-0/+1
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charsetmatz2005-09-202-4/+4
| | | | | | | | | | | | | information to content-type header.[ruby-core:5127] * lib/xmlrpc/server.rb (CGIServer::serve): ditto. * lib/xmlrpc/server.rb (ModRubyServer::serve): ditto. * lib/xmlrpc/server.rb (WEBrickServlet::service): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/syck/emitter.c (syck_scan_scalar): prevent indicators fromwhy2005-09-202-9/+10
| | | | | | | | | | | | | | | | | | appearing alone or at the end of plain scalars. [ruby-core:5826] * ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes as complex keys. * lib/syck.h: version 0.60. * lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during key searches. * ext/syck/rubyext.c: loading of binary-typed nodes. prevent emission of plain strings that look like symbols, but which aren't. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/fileutils.rb (cp_r): default is :dereference_root=>true for backward ↵aamine2005-09-191-0/+1
| | | | | | | | | compatibility. [ruby-dev:27145] * test/fileutils/test_fileutils.rb (test_cp_r): test it. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/fileutils.rb: backported from trunk (rev 1.65):aamine2005-09-181-352/+856
| | | | | | | | | | | | | | | | | | | | | | | * lib/fileutils.rb (rm_r): new option :secure. * lib/fileutils.rb (rm_rf): new option :secure. * lib/fileutils.rb: new method #remove_entry_secure. * lib/fileutils.rb (cd): remove option :noop. * lib/fileutils.rb (cp_r): new option :dereference_root. * lib/fileutils.rb (cp_r): new option :dereference_root. * lib/fileutils.rb: new method #remove_entry. * lib/fileutils.rb: new method #chmod_R. * lib/fileutils.rb: new method #chown. * lib/fileutils.rb: new method #chown_R. * lib/fileutils.rb: new method .commands. * lib/fileutils.rb: new method .options. * lib/fileutils.rb: new method .have_option?. * lib/fileutils.rb: new method .options_of. * lib/fileutils.rb: new method .collect_method. * lib/fileutils.rb: use module_function instead of single extend. * test/fileutils/test_fileutils.rb: backported from trunk (1.36). git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/yaml/rubytypes.rb: remove comments that are bungling upwhy2005-09-171-39/+4
| | | | | | | | | | | | | | | | | | the rdoc and ri output. output symbols as plain scalars. * ext/syck/rubyext.c (syck_emitter_reset): emit headless documents always. * ext/syck/emitter.c (syck_scan_scalar): quote scalars with any kind of surrounding line space, tabs or spaces alike. * ext/syck/token.c: accept tabs as whitespace, not for indentation, but strip from plain scalars. * test/yaml/test_yaml.rb: remove outdated tests. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mathn.rb (Rational::inspect): should preserve originalmatz2005-09-171-2/+3
| | | | | | | operand. [ruby-core:05806] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/cgi.rb (CGI::Cookie): should handle multiple values for amatz2005-09-171-3/+4
| | | | | | | | | | | | | cookie name. [ruby-talk:156140] * string.c (rb_str_substr): should propagate taintness even for empty strings. [ruby-dev:27121] * string.c (rb_str_aref): should infect result if range argument is tainted. [ruby-dev:27121] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixedkou2005-09-161-1/+5
| | | | | | | | | | strange RSS::Maker::Item#max_size behavior. Thanks to Kazuhiko <kazuhiko@fdiary.net>. * test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/syck/rubyext.c (syck_resolver_transfer): remove C++ stylematz2005-09-161-0/+1
| | | | | | | comment (//). [ruby-core:05793] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* forgot to update some files in the previous soap4r-1.5.5 import.nahi2005-09-152-60/+112
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should setgotoyuzo2005-09-151-0/+1
| | | | | | | $stdout.binmode. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.nahi2005-09-1545-583/+799
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #nnn is a ticket number at http://dev.ctor.org/soap4r * SOAP * allow to configure an envelope namespace of SOAP request. (#124) TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope' @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace @client.do_proc(...) * let SOAP request XML indent space configuable. see "soap.envelope.no_indent" option. (#130) * let external CES configuable. ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used by default. (#133) external CES ::= CES used in Ruby object of client and server internal CES ::= CES used in SOAP/OM * add iso-8859-1 external CES support. (#106) * fixed illegal 'qualified' handling of elements. it caused ASP.NET inteoperability problem. (#144) * added 'soap.envelope.use_numeric_character_reference' (boolean) option to let query XML use numeric character reference in XML, not plain UTF-8 character. !GoogleSearch server seems to not allow plain UTF-8 character since 2005-08-15 update. (#147) * SOAP::Header::SimpleHeader (de)serialization throws an exception on !SimpleHeader.on_(in|out)bound when header is a String. so we could not use a simple single element headerItem. fixed. thanks to emil. (#129) * out parameter of rpc operation did not work. (#132) * follow HTTP redirect only if using http-access2. (#125) (#145) * add a workaround for importing an WSDL whose path begins with drive letter. (#115) * WSDL * SOAP Data which is defined as a simpletype was not mapped correctly to Ruby obj when using wsdl2ruby.rb generated classdef file. (#123) * rpc/literal support. (#118) * re-implemented local element qualify/unqualify control. handles elementFormDefault and form in WSDL. (#119) * Array of an element which has simpleType causes a crash. (#128) * prarmeterOrder may not contain return part so it can be shorter than parts size. Thanks to Hugh. (#139) * Samples * added !BasicAuth client sample. (#117) * added Base64 client/server sample. * added Flickr SOAP interface client sample. (#122) * added !SalesForce client sample. (#135) * updated Thawte CA certificate for !GoogleAdWords sample. * updated a client script with the newer version made by Johan. thanks! * shortened long file names. (#120) * fixed typo in authheader sample. (#129) * updated deprecated method usage. (#138) git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* (Rinda::TemplateEntry::initialize): pull up method. Tabs converted to spaces.seki2005-09-141-108/+100
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread withmatz2005-09-141-1/+1
| | | | | | | readpartial. [ruby-talk:127641] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/net/https.rb: backported from trunk, rev 1.3. [ruby-dev:25673] ↵aamine2005-09-132-9/+5
| | | | | | | | | | | (again), [ruby-dev:26617] (again), [ruby-dev:27062] * ext/openssl/lib/net/https.rb: removed. * ext/openssl/lib/net/protocols.rb: removed. * lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/logger.rb (Logger): added formatter accessor to logger fornahi2005-09-131-78/+64
| | | | | | | | | | | | | | | | dictating the way in which the logger should format the messages it displays. Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and Daniel Berger. * lib/logger.rb (Logger): added VERSION constant. * lib/logger.rb: removed document for LogDevice. It is an implementation detail and is not a public interface. * test/logger/test_logger.rb: added tests. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/net/http.rb: backported from trunk, rev 1.128. [ruby-dev:25673] ↵aamine2005-09-134-456/+781
| | | | | | | | | | | | [ruby-dev:26617] * lib/net/protocol.rb: backported from trunk, rev 1.78. * lib/net/protocol.rb: new method #old_open to support net/smtp and net/pop. * lib/net/smtp.rb: use #old_open. * lib/net/pop.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* This commit was manufactured by cvs2svn to create branch 'ruby_1_8'.(no author)2005-09-131-0/+86
| | | | git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/yaml.rb: reworking YAML::Stream to use the newwhy2005-09-138-720/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emitter. * lib/yaml/stream.rb: ditto. * lib/yaml/rubytypes.rb: added Object#yaml_new. * lib/yaml/tag.rb: the tag_subclasses? method now shows up in the class. allow taguri to be set using an accessor. continue support of Object#to_yaml_type. * ext/syck/rubyext.c: new emitter code. yaml_new and yaml_initialize get called, should they be present. consolidated all the diaspora of internal node types into the family below YAML::Syck::Node -- Map, Seq, Scalar -- all of whom are SyckNode structs pointing to Ruby data. moved Object#yaml_new into the node_import and made it the default behavior. the target_class is always called wih yaml_new, prepended a parameter, which is the klass. loaded nodes through GenericResolver show their style. new Resolver#tagurize converts type ids to taguris. * ext/syck/implicit.re: were 'y' and 'n' seriously omitted?? * ext/syck/emitter.c: renovated emitter, walks the tree in advance. consolidated redundant block_styles struct into the scalar_style struct. (this means loaded nodes can now be sent back to emitter and preserve at least its very basic formatting.) * ext/syck/gram.c: headless documents of any kind allowed. * ext/syck/node.c: new syck_replace_str methods and syck_empty_* methods for rewriting node contents, while keeping the ID and other setup info. added syck_seq_assign. * ext/syck/syck.h: reflect block_styles and new node functions. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/open-uri.rb: abolish mod === tempfile to avoid a problemakr2005-09-071-2/+2
| | | | | | | [ruby-dev:26967]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e