Skip to content

Fixing support for Windows #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DotSlashNatalie wants to merge 1 commit into from
Closed

Fixing support for Windows #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/connobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
PyObject * MpConn_FromConn(conn_rec *c)
{
connobject *result;

MpConn_Type.ob_type = &PyType_Type;
result = PyObject_New(connobject, &MpConn_Type);
if (! result)
return PyErr_NoMemory();
Expand Down Expand Up @@ -325,7 +325,7 @@ static PyObject * conn_getattr(connobject *self, char *name)
{

PyObject *res;

PyMemberDef *md;
PyMethodDef *ml = connobjectmethods;
for (; ml->ml_name != NULL; ml++) {
if (name[0] == ml->ml_name[0] &&
Expand Down Expand Up @@ -404,7 +404,7 @@ static PyObject * conn_getattr(connobject *self, char *name)
"use req.useragent_ip or conn.client_ip");
}
#endif
PyMemberDef *md = find_memberdef(conn_memberlist, name);
md = find_memberdef(conn_memberlist, name);
if (!md) {
PyErr_SetString(PyExc_AttributeError, name);
return NULL;
Expand Down Expand Up @@ -446,7 +446,7 @@ static int conn_setattr(connobject *self, char* name, PyObject* value)
}

PyTypeObject MpConn_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
PyVarObject_HEAD_INIT(NULL, 0)
"mp_conn", /* tp_name */
sizeof(connobject), /* tp_basicsize */
0, /* tp_itemsize */
Expand Down
7 changes: 4 additions & 3 deletions src/filterobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ PyObject *MpFilter_FromFilter(ap_filter_t *f, apr_bucket_brigade *bb, int is_inp
char * handler, char *dir)
{
filterobject *result;

MpFilter_Type.ob_type = &PyType_Type;
result = PyObject_New(filterobject, &MpFilter_Type);
if (! result)
return PyErr_NoMemory();
Expand Down Expand Up @@ -540,12 +540,13 @@ static PyObject * filter_getattr(filterobject *self, char *name)

static int filter_setattr(filterobject *self, char *name, PyObject *v)
{
PyMemberDef *md;
if (v == NULL) {
PyErr_SetString(PyExc_AttributeError,
"can't delete filter attributes");
return -1;
}
PyMemberDef *md = find_memberdef(filter_memberlist, name);
md = find_memberdef(filter_memberlist, name);
if (!md) {
PyErr_SetString(PyExc_AttributeError, name);
return -1;
Expand All @@ -554,7 +555,7 @@ static int filter_setattr(filterobject *self, char *name, PyObject *v)
}

PyTypeObject MpFilter_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
PyVarObject_HEAD_INIT(NULL, 0)
"mp_filter", /* tp_name */
sizeof(filterobject), /* tp_basicsize */
0, /* tp_itemsize */
Expand Down
4 changes: 2 additions & 2 deletions src/finfoobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
PyObject * MpFinfo_FromFinfo(apr_finfo_t *f)
{
finfoobject *result;

MpFinfo_Type.ob_type = &PyType_Type;
result = PyObject_New(finfoobject, &MpFinfo_Type);
if (! result)
return PyErr_NoMemory();
Expand Down Expand Up @@ -377,7 +377,7 @@ static PyObject *finfo_repr(finfoobject *self)
}

PyTypeObject MpFinfo_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
PyVarObject_HEAD_INIT(NULL, 0)
"mp_finfo", /* tp_name */
sizeof(finfoobject), /* tp_basicsize */
0, /* tp_itemsize */
Expand Down
7 changes: 4 additions & 3 deletions src/hlistobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
PyObject *MpHList_FromHLEntry(hl_entry *hle)
{
hlistobject *result;

MpHList_Type.ob_type = &PyType_Type;
result = PyObject_New(hlistobject, &MpHList_Type);
if (! result)
PyErr_NoMemory();
Expand Down Expand Up @@ -92,6 +92,7 @@ static void hlist_dealloc(hlistobject *self)
static PyObject *hlist_getattr(hlistobject *self, char *name)
{
PyObject *res;
PyMemberDef *md;

PyMethodDef *ml = hlistmethods;
for (; ml->ml_name != NULL; ml++) {
Expand All @@ -109,7 +110,7 @@ static PyObject *hlist_getattr(hlistobject *self, char *name)
return Py_None;
}

PyMemberDef *md = find_memberdef(hlist_memberlist, name);
md = find_memberdef(hlist_memberlist, name);
if (!md) {
PyErr_SetString(PyExc_AttributeError, name);
return NULL;
Expand Down Expand Up @@ -164,7 +165,7 @@ static PyObject *hlist_repr(hlistobject *self)
}

PyTypeObject MpHList_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
PyVarObject_HEAD_INIT(NULL, 0)
"mp_hlist", /* tp_name */
sizeof(hlistobject), /* tp_basicsize */
0, /* tp_itemsize */
Expand Down
6 changes: 4 additions & 2 deletions src/mod_python.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,7 @@ static const char *python_directive_handler(cmd_parms *cmd, py_config* conf,
char d_is_fnmatch = 0;
char d_is_location = 0;
ap_regex_t *regex = NULL;
const char *exts;

determine_context(cmd->pool, cmd, &directory, &d_is_fnmatch, &d_is_location, &regex);

Expand All @@ -1169,7 +1170,7 @@ static const char *python_directive_handler(cmd_parms *cmd, py_config* conf,
* PythonHandler.ext2 foo
*/

const char *exts = val;
exts = val;
val = ap_getword(cmd->pool, &exts, '|');

if (*exts == '\0') {
Expand Down Expand Up @@ -2609,6 +2610,7 @@ static void PythonChildInitHandler(apr_pool_t *p, server_rec *s)
const apr_array_header_t *ah;
apr_table_entry_t *elts;
int i;
interpreterdata *idata;

py_config *conf = ap_get_module_config(s->module_config, &python_module);
py_global_config *glb;
Expand All @@ -2618,7 +2620,7 @@ static void PythonChildInitHandler(apr_pool_t *p, server_rec *s)
PyEval_RestoreThread(global_tstate);
PyOS_AfterFork();

interpreterdata *idata = save_interpreter(MAIN_INTERPRETER, PyThreadState_Get());
idata = save_interpreter(MAIN_INTERPRETER, PyThreadState_Get());
if (!idata)
ap_log_error(APLOG_MARK, APLOG_ERR, 0, main_server,
"PythonChildInitHandler: save_interpreter() returned NULL. No more memory?");
Expand Down
17 changes: 17 additions & 0 deletions src/mod_python.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_python", "mod_python.vcxproj", "{91935325-716F-4776-825B-7A2250320FC1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{91935325-716F-4776-825B-7A2250320FC1}.Release|Win32.ActiveCfg = Release|Win32
{91935325-716F-4776-825B-7A2250320FC1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
102 changes: 102 additions & 0 deletions src/mod_python.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{91935325-716F-4776-825B-7A2250320FC1}</ProjectGuid>
<SccProjectName />
<SccLocalPath />
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>include;$(PYTHONSRC)\include;$(APACHESRC)\include;C:\Python27\include;C:\tools\httpd-2.4.6\include;C:\tools\apr-1.4.8\include;C:\tools\apr-util-1.5.2\include;C:\tools\httpd-2.4.6\os\win32;C:\tools\httpd-2.4.6\modules\filters;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>.\Release/mod_python.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
<ObjectFileName>.\Release/</ObjectFileName>
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libhttpd.lib;apr-1.lib;libapriconv-1.lib;libapr-1.lib;libaprutil-1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Release/mod_python.so</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(APACHESRC)\lib;$(PYTHONSRC)\libs;C:\tools\Apache24\lib;C:\Python27\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\Release/mod_python.pdb</ProgramDatabaseFile>
<ImportLibrary>.\Release/mod_python.lib</ImportLibrary>
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\Release/mod_python.tlb</TypeLibraryName>
</Midl>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="include\connobject.h" />
<ClInclude Include="include\filterobject.h" />
<ClInclude Include="include\hlist.h" />
<ClInclude Include="include\hlistobject.h" />
<ClInclude Include="include\mod_python.h" />
<ClInclude Include="include\requestobject.h" />
<ClInclude Include="include\serverobject.h" />
<ClInclude Include="include\tableobject.h" />
<ClInclude Include="include\util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="finfoobject.c" />
<ClCompile Include="version.c" />
<ClCompile Include="_apachemodule.c" />
<ClCompile Include="connobject.c" />
<ClCompile Include="filterobject.c" />
<ClCompile Include="hlist.c" />
<ClCompile Include="hlistobject.c" />
<ClCompile Include="mod_python.c" />
<ClCompile Include="requestobject.c" />
<ClCompile Include="serverobject.c" />
<ClCompile Include="tableobject.c" />
<ClCompile Include="util.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
51 changes: 51 additions & 0 deletions src/mod_python.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{a90f906b-139f-461b-9179-9f6767afec72}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\connobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\filterobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\hlist.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\hlistobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\mod_python.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\requestobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\serverobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\tableobject.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\util.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="_apachemodule.c" />
<ClCompile Include="connobject.c" />
<ClCompile Include="filterobject.c" />
<ClCompile Include="hlist.c" />
<ClCompile Include="hlistobject.c" />
<ClCompile Include="mod_python.c" />
<ClCompile Include="requestobject.c" />
<ClCompile Include="serverobject.c" />
<ClCompile Include="tableobject.c" />
<ClCompile Include="util.c" />
<ClCompile Include="finfoobject.c" />
<ClCompile Include="version.c" />
</ItemGroup>
</Project>
Loading