← Back to branch summary

~ubuntu-branches/ubuntu/hardy/libapache2-mod-python/hardy

« back to all changes in this revision

Viewing changes to src/serverobject.c

  • Committer: Bazaar Package Importer
  • Author(s): Norbert Tretkowski, Piotr Ozarowski
  • Date: 2006-10-12 17:14:47 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20061012171447-ji7e0w38nl37kknp
Tags: 3.2.10-2
http://bugs.debian.org/391790
http://bugs.debian.org/388834
http://bugs.debian.org/384752
http://bugs.debian.org/391811
[ Piotr Ozarowski ]
* Dependencies updated:
  + replaced apache2-common with apache2.2-common (closes: #391790)
  + bumped apache2-threaded-dev version (see above),
  + bumped python-central version (dh_python removed from debian/rules),
  + bumped debhelper version (see above),
  + added po-debconf to Build-Depends (lintian error).
* Removed deprecated dh_installmanpages from debian/rules
  (there are no manpages to install).
* Updated Dutch debconf translation from Vincent Zweije. (closes: #388834)
* Updated Czech debconf translation from Miroslav Kure. (closes: #384752)
* Updated Japanese debconf translation from Hideki Yamane. (closes: #391811)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/serverobject.c
18
18
 *
19
19
 * serverobject.c 
20
20
 *
21
 
 * $Id: serverobject.c 357352 2005-12-17 17:31:35Z jgallacher $
 
21
 * $Id: serverobject.c 393438 2006-04-12 11:16:42Z grahamd $
22
22
 *
23
23
 */
24
24
 
67
67
}
68
68
 
69
69
/**
 
70
 ** server.get_options(server self)
 
71
 **
 
72
 *     Returns the options set through PythonOption directives.
 
73
 *     unlike req.get_options, this one returns the per-server config
 
74
 */
 
75
 
 
76
static PyObject * server_get_options(serverobject *self)
 
77
{
 
78
    py_config *conf =
 
79
        (py_config *) ap_get_module_config(self->server->module_config,
 
80
                                           &python_module);
 
81
    return MpTable_FromTable(conf->options);
 
82
}
 
83
 
 
84
/**
70
85
 ** server.register_cleanup(req, handler, data)
71
86
 **
72
87
 *    same as request.register_cleanup, except the server pool is used.
120
135
 
121
136
static PyMethodDef server_methods[] = {
122
137
    {"get_config",           (PyCFunction) server_get_config,        METH_NOARGS},
 
138
    {"get_options",          (PyCFunction) server_get_options,       METH_NOARGS},
123
139
    {"register_cleanup",     (PyCFunction) server_register_cleanup,  METH_VARARGS},
124
140
    { NULL, NULL } /* sentinel */
125
141
};