Branch: Tag:

1999-06-10

1999-06-10 03:33:09 by Martin Stjernholm <mast@lysator.liu.se>

Don't query the module about the extensions to remove in
disable_module(); it might not be the same as on module load.

Rev: server/base_server/configuration.pike:1.198

1: - string cvs_version = "$Id: configuration.pike,v 1.197 1999/06/07 05:17:13 mast Exp $"; + string cvs_version = "$Id: configuration.pike,v 1.198 1999/06/10 03:33:09 mast Exp $";   #include <module.h>   #include <roxen.h>   
3047:    perror("Disabling "+module->name+" # "+id+"\n");   #endif    -  if(module["type"] & MODULE_EXTENSION -  && arrayp( me -> query_extensions())) +  if(module["type"] & MODULE_EXTENSION)    {    string foo; -  foreach( me -> query_extensions(), foo ) +     for(pr=0; pr<10; pr++) -  if( pri[pr]->extension_modules[ foo ] ) +  foreach( indices (pri[pr]->extension_modules), foo )    pri[pr]->extension_modules[ foo ]-= ({ me });    }    -  if(module["type"] & MODULE_FILE_EXTENSION -  && arrayp( me -> query_file_extensions())) +  if(module["type"] & MODULE_FILE_EXTENSION)    {    string foo; -  foreach( me -> query_file_extensions(), foo ) +     for(pr=0; pr<10; pr++) -  if(pri[pr]->file_extension_modules[ foo ] ) +  foreach( indices (pri[pr]->file_extension_modules), foo )    pri[pr]->file_extension_modules[foo]-=({me});    }