Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c7536c4f
Commit
c7536c4f
authored
Mar 15, 2012
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge heads
parents
ba98788b
20b303ed
Changes
12
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
142 additions
and
69 deletions
+142
-69
Include/patchlevel.h
Include/patchlevel.h
+1
-1
Makefile.pre.in
Makefile.pre.in
+2
-2
Misc/README.OpenBSD
Misc/README.OpenBSD
+1
-1
Modules/expat/expat.h
Modules/expat/expat.h
+9
-0
Modules/expat/pyexpatns.h
Modules/expat/pyexpatns.h
+1
-0
Modules/expat/xmlparse.c
Modules/expat/xmlparse.c
+118
-59
Modules/pyexpat.c
Modules/pyexpat.c
+2
-0
PC/pyconfig.h
PC/pyconfig.h
+1
-1
Python/thread.c
Python/thread.c
+1
-1
configure
configure
+2
-3
configure.ac
configure.ac
+0
-0
pyconfig.h.in
pyconfig.h.in
+4
-1
No files found.
Include/patchlevel.h
View file @
c7536c4f
...
...
@@ -2,7 +2,7 @@
/* Python version identification scheme.
When the major or minor version changes, the VERSION variable in
configure.
in
must also be changed.
configure.
ac
must also be changed.
There is also (independent) API version information in modsupport.h.
*/
...
...
Makefile.pre.in
View file @
c7536c4f
...
...
@@ -151,7 +151,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO
=
Include Lib Misc Demo
# Files and directories to be distributed
CONFIGFILES
=
configure configure.
in
acconfig.h pyconfig.h.in Makefile.pre.in
CONFIGFILES
=
configure configure.
ac
acconfig.h pyconfig.h.in Makefile.pre.in
DISTFILES
=
README ChangeLog
$(CONFIGFILES)
DISTDIRS
=
$(SUBDIRS)
$(SUBDIRSTOO)
Ext-dummy
DIST
=
$(DISTFILES)
$(DISTDIRS)
...
...
@@ -1137,7 +1137,7 @@ recheck:
$(SHELL)
config.status
--recheck
$(SHELL)
config.status
# Rebuild the configure script from configure.
in
; also rebuild pyconfig.h.in
# Rebuild the configure script from configure.
ac
; also rebuild pyconfig.h.in
autoconf
:
(
cd
$(srcdir)
;
autoconf
)
(
cd
$(srcdir)
;
autoheader
)
...
...
Misc/README.OpenBSD
View file @
c7536c4f
...
...
@@ -29,7 +29,7 @@ script to disable certain options. Search for a line that looks like:
If your version is not in that list, e.g., 3.9, add the version
number. In this case, you would just need to add a 9 after the 8.
If you modify configure.
in
, you will need to regenerate configure
If you modify configure.
ac
, you will need to regenerate configure
with autoconf.
If your version is already in the list, this is not a known problem.
...
...
Modules/expat/expat.h
View file @
c7536c4f
...
...
@@ -883,6 +883,15 @@ XMLPARSEAPI(int)
XML_SetParamEntityParsing
(
XML_Parser
parser
,
enum
XML_ParamEntityParsing
parsing
);
/* Sets the hash salt to use for internal hash calculations.
Helps in preventing DoS attacks based on predicting hash
function behavior. This must be called before parsing is started.
Returns 1 if successful, 0 when called after parsing has started.
*/
XMLPARSEAPI
(
int
)
XML_SetHashSalt
(
XML_Parser
parser
,
unsigned
long
hash_salt
);
/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
XML_GetErrorCode returns information about the error.
*/
...
...
Modules/expat/pyexpatns.h
View file @
c7536c4f
...
...
@@ -97,6 +97,7 @@
#define XML_SetEntityDeclHandler PyExpat_XML_SetEntityDeclHandler
#define XML_SetExternalEntityRefHandler PyExpat_XML_SetExternalEntityRefHandler
#define XML_SetExternalEntityRefHandlerArg PyExpat_XML_SetExternalEntityRefHandlerArg
#define XML_SetHashSalt PyExpat_XML_SetHashSalt
#define XML_SetNamespaceDeclHandler PyExpat_XML_SetNamespaceDeclHandler
#define XML_SetNotationDeclHandler PyExpat_XML_SetNotationDeclHandler
#define XML_SetNotStandaloneHandler PyExpat_XML_SetNotStandaloneHandler
...
...
Modules/expat/xmlparse.c
View file @
c7536c4f
This diff is collapsed.
Click to expand it.
Modules/pyexpat.c
View file @
c7536c4f
...
...
@@ -1245,6 +1245,8 @@ newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
else
{
self
->
itself
=
XML_ParserCreate
(
encoding
);
}
XML_SetHashSalt
(
self
->
itself
,
(
unsigned
long
)
_Py_HashSecret
.
prefix
);
self
->
intern
=
intern
;
Py_XINCREF
(
self
->
intern
);
#ifdef Py_TPFLAGS_HAVE_GC
...
...
PC/pyconfig.h
View file @
c7536c4f
...
...
@@ -344,7 +344,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
# define SIZEOF_FPOS_T 8
# define SIZEOF_HKEY 8
# define SIZEOF_SIZE_T 8
/* configure.
in
defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
/* configure.
ac
defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
On Win64 the second condition is not true, but if fpos_t replaces off_t
then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
...
...
Python/thread.c
View file @
c7536c4f
...
...
@@ -24,7 +24,7 @@
#include <stdlib.h>
#ifdef __sgi
#ifndef HAVE_PTHREAD_H
/* XXX Need to check in configure.
in
*/
#ifndef HAVE_PTHREAD_H
/* XXX Need to check in configure.
ac
*/
#undef _POSIX_THREADS
#endif
#endif
...
...
configure
View file @
c7536c4f
#! /bin/sh
# From configure.
in
Revision.
# From configure.
ac
Revision.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for python 3.1.
#
...
...
@@ -769,8 +769,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
CPP
CPPFLAGS'
CPP'
# Initialize some variables set by options.
...
...
configure.
in
→
configure.
ac
View file @
c7536c4f
File moved
pyconfig.h.in
View file @
c7536c4f
/* pyconfig.h.in. Generated from configure.
in
by autoheader. */
/* pyconfig.h.in. Generated from configure.
ac
by autoheader. */
#ifndef Py_PYCONFIG_H
...
...
@@ -1102,6 +1102,9 @@
/* This must be defined on some systems to enable large file support. */
#undef _LARGEFILE_SOURCE
/* This must be defined on AIX systems to enable large file support. */
#undef _LARGE_FILES
/* Define to 1 if on MINIX. */
#undef _MINIX
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment