Branch: Tag:

2008-08-15

2008-08-15 12:33:55 by Martin Stjernholm <mast@lysator.liu.se>

Moving to pike 7.8 and dropping compatibility with earlier pikes.

Rev: server/arg_cache_plugins/replicate.pike:1.27
Rev: server/base_server/__default.pmod:1.2
Rev: server/base_server/cache.pike:1.90
Rev: server/base_server/config_userdb.pike:1.53
Rev: server/base_server/configuration.pike:1.653
Rev: server/base_server/emit_object.pike:1.7
Rev: server/base_server/fonts.pike:1.87
Rev: server/base_server/global_variables.pike:1.110
Rev: server/base_server/javamodule.pike:1.7
Rev: server/base_server/language.pike:1.43
Rev: server/base_server/module.pike:1.231
Rev: server/base_server/module_support.pike:1.135
Rev: server/base_server/prototypes.pike:1.219
Rev: server/base_server/roxen.pike:1.981
Rev: server/base_server/roxenlib.pike:1.224
Rev: server/base_server/roxenloader.pike:1.397
Rev: server/base_server/rxmlhelp.pike:1.65
Rev: server/base_server/smtprelay.pike:3.2
Rev: server/base_server/snmpagent.pike:1.24
Rev: server/bin/buildenv.pike:1.10
Rev: server/bin/create_testcert.pike:1.2
Rev: server/bin/functions:1.19
Rev: server/bin/garbagecollector.pike:1.23
Rev: server/bin/setup_nsr.pike:1.4
Rev: server/bin/sqlhelper.pike:1.4
Rev: server/config_interface/actions/change_version.pike:1.15
Rev: server/config_interface/actions/debug_info.pike:1.40
Rev: server/config_interface/actions/feature_list.pike:1.14
Rev: server/config_interface/actions/ftpstatus.pike:1.4
Rev: server/config_interface/actions/generate_rsa.pike:1.7
Rev: server/config_interface/actions/make_rsa_csr.pike:1.11
Rev: server/config_interface/actions/make_selfsigned_dsa.pike:1.11
Rev: server/config_interface/actions/make_selfsigned_rsa.pike:1.10
Rev: server/config_interface/actions/ssl_common.pike:1.8
Rev: server/config_interface/actions/tablist.pike:1.10
Rev: server/config_interface/actions/threads.pike:1.8
Rev: server/etc/env.d/java.pike:1.19
Rev: server/etc/include/variables.h:1.18
Rev: server/etc/modules/DBManager.pmod:1.76
Rev: server/etc/modules/ExtSQL.pmod:1.4
Rev: server/etc/modules/ExtScript.pmod:1.22
Rev: server/etc/modules/GText.pmod:1.20
Rev: server/etc/modules/HTML.pmod:1.8
Rev: server/etc/modules/JavaModule.pmod:1.25
Rev: server/etc/modules/LazyImage.pmod/CoordinateSystem.pike:1.4
Rev: server/etc/modules/LazyImage.pmod/Legend.pike:1.5
Rev: server/etc/modules/LazyImage.pmod/module.pmod:1.19
Rev: server/etc/modules/License.pmod:1.27
Rev: server/etc/modules/Map.pmod:1.7
Rev: server/etc/modules/PropertySet.pike:1.12
Rev: server/etc/modules/RXML.pmod/PEnt.pike:1.24
Rev: server/etc/modules/RXML.pmod/PXml.pike:1.65
Rev: server/etc/modules/RXML.pmod/module.pmod:1.367
Rev: server/etc/modules/Roxen.pmod:1.246
Rev: server/etc/modules/RoxenDebug.pmod:1.12
Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Client.pike:1.10
Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Server.pike:1.6
Rev: server/etc/modules/RoxenSSLFile.pike:1.27(DEAD)
Rev: server/etc/modules/SNMP.pmod:1.10
Rev: server/etc/modules/Servlet.pmod:1.31
Rev: server/etc/modules/SloppyDOM.pmod:1.16
Rev: server/etc/modules/StateHandler.pmod:1.13
Rev: server/etc/modules/VFS.pmod:1.7
Rev: server/etc/modules/Variable.pmod/Date.pike:1.9
Rev: server/etc/modules/Variable.pmod/Email.pike:1.15
Rev: server/etc/modules/Variable.pmod/Image.pike:1.5
Rev: server/etc/modules/Variable.pmod/Language.pike:1.2
Rev: server/etc/modules/Variable.pmod/MapLocation.pike:1.6
Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.9
Rev: server/etc/modules/Variable.pmod/Upload.pike:1.5
Rev: server/etc/modules/Variable.pmod/module.pmod:1.108
Rev: server/etc/modules/_NewLDAP.pmod/client.pike:1.11(DEAD)
Rev: server/etc/modules/_NewLDAP.pmod/ldap_globals.h:1.1(DEAD)
Rev: server/etc/modules/_NewLDAP.pmod/ldap_privates.pmod:1.1(DEAD)
Rev: server/etc/modules/_NewLDAP.pmod/module.pmod:1.4(DEAD)
Rev: server/etc/modules/_NewLDAP.pmod/protocol.pike:1.1(DEAD)
Rev: server/etc/roxen_master.pike:1.150
Rev: server/etc/test/tests/ftp/ftp_test.pike:1.4
Rev: server/font_handlers/freetype.pike:1.30
Rev: server/font_handlers/imagedir.pike:1.15
Rev: server/font_handlers/imagetar.pike:1.10
Rev: server/font_handlers/ttf.pike:1.18
Rev: server/languages/catala.pike:1.11
Rev: server/languages/chinese.pike:1.2
Rev: server/languages/croatian.pike:1.11
Rev: server/languages/czech.pike:1.18
Rev: server/languages/dutch.pike:1.11
Rev: server/languages/finnish.pike:1.10
Rev: server/languages/french.pike:1.13
Rev: server/languages/german.pike:1.11
Rev: server/languages/hungarian.pike:1.7
Rev: server/languages/italian.pike:1.13
Rev: server/languages/japanese.pike:1.22
Rev: server/languages/maori.pike:1.9
Rev: server/languages/norwegian.pike:1.12
Rev: server/languages/polish.pike:1.8
Rev: server/languages/portuguese.pike:1.11
Rev: server/languages/russian.pike:1.10
Rev: server/languages/serbian.pike:1.10
Rev: server/languages/slovenian.pike:1.17
Rev: server/languages/spanish.pike:1.12
Rev: server/languages/swedish.pike:1.20
Rev: server/modules/configuration/config_tags.pike:1.197
Rev: server/modules/configuration/roxen_test.pike:1.68
Rev: server/modules/configuration/update.pike:1.40
Rev: server/modules/examples/userdb_ex.pike:1.8
Rev: server/modules/filesystems/filesystem.pike:1.157
Rev: server/modules/filesystems/incoming.pike:1.19
Rev: server/modules/filesystems/restrictedfs.pike:1.24
Rev: server/modules/filesystems/sqlfs.pike:1.9
Rev: server/modules/filesystems/userfs.pike:1.71
Rev: server/modules/filters/tableborder.pike:1.13
Rev: server/modules/filters/whitespace_remover.pike:1.4
Rev: server/modules/graphics/business.pike:1.152
Rev: server/modules/graphics/gxml.pike:1.38
Rev: server/modules/graphics/pimage.pike:1.31
Rev: server/modules/graphics/rimage/rimage.pike:1.23
Rev: server/modules/icecast/icecast.pike:1.12
Rev: server/modules/icecast/pl_common.pike:1.9
Rev: server/modules/js-support/javascript_support.pike:1.68
Rev: server/modules/ldap/ldaptag.pike:2.38
Rev: server/modules/ldap/userdb_ldap.pike:1.14
Rev: server/modules/logging/home_logger.pike:1.35
Rev: server/modules/misc/preferred_language.pike:1.32
Rev: server/modules/misc/randomtext.pike:1.10
Rev: server/modules/misc/wapadapter.pike:1.13
Rev: server/modules/misc/webdav.pike:1.38
Rev: server/modules/proxies/connect.pike:1.20
Rev: server/modules/proxies/proxy.pike:1.57
Rev: server/modules/proxies/wais.pike:1.28
Rev: server/modules/scripting/cgi.pike:2.65
Rev: server/modules/scripting/fastcgi.pike:2.13
Rev: server/modules/scripting/perl.pike:2.26
Rev: server/modules/scripting/php.pike:2.5
Rev: server/modules/scripting/piketag.pike:2.38
Rev: server/modules/scripting/servlet.pike:2.24
Rev: server/modules/scripting/webapp.pike:2.32
Rev: server/modules/security/auth_httpbasic.pike:1.12
Rev: server/modules/security/auth_httpcookie.pike:1.12
Rev: server/modules/security/htaccess.pike:1.106
Rev: server/modules/security/userdb_sql.pike:1.10
Rev: server/modules/security/userdb_system.pike:1.12
Rev: server/modules/tags/accessed.pike:1.57
Rev: server/modules/tags/email.pike:1.43
Rev: server/modules/tags/emit_exec.pike:1.4
Rev: server/modules/tags/emit_timerange.pike:1.29
Rev: server/modules/tags/insert_cached_href.pike:1.22
Rev: server/modules/tags/obox.pike:1.41
Rev: server/modules/tags/rxmltags.pike:1.553
Rev: server/modules/tags/wizz.pike:1.10
Rev: server/modules/tags/writefile.pike:1.20
Rev: server/modules/throttling/throttling_byaddress.pike:1.6
Rev: server/modules/throttling/throttling_bytime.pike:1.8
Rev: server/ntroxenloader.pike:1.9
Rev: server/protocols/ftp.pike:2.125
Rev: server/protocols/http.pike:1.561
Rev: server/protocols/prot_hilfe.pike:2.15
Rev: server/protocols/prot_snmp.pike:2.8
Rev: server/sbin/roxen-create-server:1.5
Rev: server/tools/ntroxen/startdll/cmdline.cpp:1.21

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.652 2008/06/24 16:19:52 mast Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.653 2008/08/15 12:33:53 mast Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
177:   inherit Configuration;   inherit "basic_defvar";    - static mapping(RequestID:mapping) current_connections = + protected mapping(RequestID:mapping) current_connections =    set_weak_flag( ([ ]), 1 );      void connection_add( RequestID id, mapping data )
214:      class DataCache   { -  static typedef array(string|mapping(string:mixed))|string| +  protected typedef array(string|mapping(string:mixed))|string|    function(string, RequestID:string|int) EntryType;       mapping(string:EntryType) cache = ([]);
234:    }       // Expire a single entry. -  static void really_low_expire_entry(string key) +  protected void really_low_expire_entry(string key)    {    EntryType e = m_delete(cache, key);    if (arrayp(e)) {
246:    }       // NOTE: Avoid using this function if possible! O(n) -  static int low_expire_entry(string key_prefix) +  protected int low_expire_entry(string key_prefix)    {    if (!key_prefix) return 0;    if (arrayp(cache[key_prefix])) {
300:    }       //! Clear ~1/10th of the cache. -  static void clear_some_cache() +  protected void clear_some_cache()    {    array(string) q = indices(cache);    if(!sizeof(q))
464:    clear_some_cache();    }    -  static void create() +  protected void create()    {    init_from_variables();    }
833:    return url_module_cache;   }    - static mapping api_module_cache = ([]); + protected mapping api_module_cache = ([]);   mapping api_functions(void|RequestID id)   {    return api_module_cache+([]);
877:    return last_module_cache;   }    - static mixed strip_fork_information(RequestID id) + protected mixed strip_fork_information(RequestID id)   {    if (uname()->sysname == "Darwin") {    // Look for Mac OS X special filenames that are used access files in
1191:    User uid;    foreach( user_databases(), UserDB m )    if( uid = m->find_user( u ) ) -  return uid->compat_userinfo(id); +  return uid->compat_userinfo();   }      array(string) userlist(RequestID|void id)
1466:   }      // Returns tuple < image, mime-type > - static array(string) draw_saturation_bar(int hue,int brightness, int where, + protected array(string) draw_saturation_bar(int hue,int brightness, int where,    int small_version)   {    Image.Image bar =
1505: Inside #if constant(Image.GIF) && constant(Image.PNG)
  array(mapping) spinner_data = 0;      // Returns tuple < image, mime type > - static array(string) draw_spinner(string bgcolor) + protected array(string) draw_spinner(string bgcolor)   {    // Parse color    array color = parse_color(bgcolor);
1792:    return state;   }    - static multiset(DAVLock) active_locks = (<>); + protected multiset(DAVLock) active_locks = (<>);      //! Unlock the lock represented by @[lock] on @[path].   //!
1844:    return min_time - t;   }    - static void expire_lock_loop() + protected void expire_lock_loop()   {    int t = expire_locks(0); // NOTE: Called with RequestID 0!   
3013:    return res;   }    - static RequestID make_fake_id (string s, RequestID id) + protected RequestID make_fake_id (string s, RequestID id)   {    RequestID fake_id;   
3484:   #define MODULE_LOCK(TYPE)   #endif    - static int enable_module_batch_msgs; + protected int enable_module_batch_msgs;      RoxenModule enable_module( string modname, RoxenModule|void me,    ModuleInfo|void moduleinfo,
4162:   // END SQL   #endif    - static string my_url; + protected string my_url;      void fix_my_url()   {
4189:    after_init_hooks |= ({ what });   }    - static int got_no_delayed_load = 0; + protected int got_no_delayed_load = 0;   // 0 -> enable delayed loading, 1 -> disable delayed loading,   // -1 -> don't change.   
4239:    array modules_to_process = indices( enabled_modules );    string tmp_string;    + #if 0 +  if (enabled_modules["sbtags_2.0#0"]) +  modules_to_process = +  ({"sbtags_2.0#0"}) + (modules_to_process - ({"sbtags_2.0#0"})); + #endif +     mixed err;    forcibly_added = ([]);    enable_module_batch_msgs = 1;
4290:      DataCache datacache;    - static void create() + protected void create()   {    if (!name) error ("Configuration name not set through bootstrap_info.\n");   // int st = gethrtime();
5132:   // report_debug("[restore: %.1fms] ", (gethrtime()-st)/1000.0 );   }    - static int arent_we_throttling_server () { + protected int arent_we_throttling_server () {    return !query("throttle");   } - static int arent_we_throttling_request() { + protected int arent_we_throttling_request() {    return !query("req_throttle");   }      #ifdef SNMP_AGENT - private static int(0..1) snmp_disabled() { + private int(0..1) snmp_disabled() {    return (!snmp_global_disabled() && !query("snmp_process"));   } - private static int(0..1) snmp_global_disabled() { + private int(0..1) snmp_global_disabled() {    return (!objectp(roxen->snmpagent));   }   #endif