Nuke the MIT-SUNDRY-NONSTANDARD extension.
This extension provided bug-compatibility with pre-X11R6, but has been stubbed out in our server since 2006 to return BadRequest when you actually asked for it.
This commit is contained in:
parent
13adef8a17
commit
25827fde68
|
@ -28,7 +28,6 @@ BUILTIN_SRCS = \
|
||||||
# Sources always included in libXextmodule.la & libXext.la
|
# Sources always included in libXextmodule.la & libXext.la
|
||||||
MODULE_SRCS = \
|
MODULE_SRCS = \
|
||||||
bigreq.c \
|
bigreq.c \
|
||||||
mitmisc.c \
|
|
||||||
shape.c \
|
shape.c \
|
||||||
sync.c \
|
sync.c \
|
||||||
xcmisc.c
|
xcmisc.c
|
||||||
|
|
155
Xext/mitmisc.c
155
Xext/mitmisc.c
|
@ -1,155 +0,0 @@
|
||||||
/************************************************************
|
|
||||||
|
|
||||||
Copyright 1989, 1998 The Open Group
|
|
||||||
|
|
||||||
Permission to use, copy, modify, distribute, and sell this software and its
|
|
||||||
documentation for any purpose is hereby granted without fee, provided that
|
|
||||||
the above copyright notice appear in all copies and that both that
|
|
||||||
copyright notice and this permission notice appear in supporting
|
|
||||||
documentation.
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
||||||
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
Except as contained in this notice, the name of The Open Group shall not be
|
|
||||||
used in advertising or otherwise to promote the sale, use or other dealings
|
|
||||||
in this Software without prior written authorization from The Open Group.
|
|
||||||
|
|
||||||
********************************************************/
|
|
||||||
|
|
||||||
/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
|
|
||||||
|
|
||||||
|
|
||||||
#define NEED_EVENTS
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
|
||||||
#include <dix-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <X11/X.h>
|
|
||||||
#include <X11/Xproto.h>
|
|
||||||
#include "misc.h"
|
|
||||||
#include "os.h"
|
|
||||||
#include "dixstruct.h"
|
|
||||||
#include "extnsionst.h"
|
|
||||||
#define _MITMISC_SERVER_
|
|
||||||
#include <X11/extensions/mitmiscstr.h>
|
|
||||||
#include "modinit.h"
|
|
||||||
|
|
||||||
static void MITResetProc(
|
|
||||||
ExtensionEntry * /* extEntry */
|
|
||||||
);
|
|
||||||
|
|
||||||
static DISPATCH_PROC(ProcMITDispatch);
|
|
||||||
static DISPATCH_PROC(ProcMITGetBugMode);
|
|
||||||
static DISPATCH_PROC(ProcMITSetBugMode);
|
|
||||||
static DISPATCH_PROC(SProcMITDispatch);
|
|
||||||
static DISPATCH_PROC(SProcMITGetBugMode);
|
|
||||||
static DISPATCH_PROC(SProcMITSetBugMode);
|
|
||||||
|
|
||||||
void
|
|
||||||
MITMiscExtensionInit(INITARGS)
|
|
||||||
{
|
|
||||||
AddExtension(MITMISCNAME, 0, 0,
|
|
||||||
ProcMITDispatch, SProcMITDispatch,
|
|
||||||
MITResetProc, StandardMinorOpcode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*ARGSUSED*/
|
|
||||||
static void
|
|
||||||
MITResetProc (extEntry)
|
|
||||||
ExtensionEntry *extEntry;
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
ProcMITSetBugMode(client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
REQUEST(xMITSetBugModeReq);
|
|
||||||
|
|
||||||
REQUEST_SIZE_MATCH(xMITSetBugModeReq);
|
|
||||||
if (stuff->onOff != xFalse)
|
|
||||||
return BadRequest;
|
|
||||||
return(client->noClientException);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
ProcMITGetBugMode(client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
xMITGetBugModeReply rep;
|
|
||||||
register int n;
|
|
||||||
|
|
||||||
REQUEST_SIZE_MATCH(xMITGetBugModeReq);
|
|
||||||
rep.type = X_Reply;
|
|
||||||
rep.length = 0;
|
|
||||||
rep.sequenceNumber = client->sequence;
|
|
||||||
rep.onOff = FALSE;
|
|
||||||
if (client->swapped) {
|
|
||||||
swaps(&rep.sequenceNumber, n);
|
|
||||||
swapl(&rep.length, n);
|
|
||||||
}
|
|
||||||
WriteToClient(client, sizeof(xMITGetBugModeReply), (char *)&rep);
|
|
||||||
return(client->noClientException);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
ProcMITDispatch (client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
REQUEST(xReq);
|
|
||||||
switch (stuff->data)
|
|
||||||
{
|
|
||||||
case X_MITSetBugMode:
|
|
||||||
return ProcMITSetBugMode(client);
|
|
||||||
case X_MITGetBugMode:
|
|
||||||
return ProcMITGetBugMode(client);
|
|
||||||
default:
|
|
||||||
return BadRequest;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
SProcMITSetBugMode(client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
register int n;
|
|
||||||
REQUEST(xMITSetBugModeReq);
|
|
||||||
|
|
||||||
swaps(&stuff->length, n);
|
|
||||||
return ProcMITSetBugMode(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
SProcMITGetBugMode(client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
register int n;
|
|
||||||
REQUEST(xMITGetBugModeReq);
|
|
||||||
|
|
||||||
swaps(&stuff->length, n);
|
|
||||||
return ProcMITGetBugMode(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
SProcMITDispatch (client)
|
|
||||||
register ClientPtr client;
|
|
||||||
{
|
|
||||||
REQUEST(xReq);
|
|
||||||
switch (stuff->data)
|
|
||||||
{
|
|
||||||
case X_MITSetBugMode:
|
|
||||||
return SProcMITSetBugMode(client);
|
|
||||||
case X_MITGetBugMode:
|
|
||||||
return SProcMITGetBugMode(client);
|
|
||||||
default:
|
|
||||||
return BadRequest;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1106,7 +1106,6 @@ if test "x$DEBUGGING" = xyes; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
|
AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
|
||||||
|
|
||||||
AC_DEFINE(MITMISC, 1, [Support MIT Misc extension])
|
|
||||||
AC_DEFINE(XTEST, 1, [Support XTest extension])
|
AC_DEFINE(XTEST, 1, [Support XTest extension])
|
||||||
AC_DEFINE(XSYNC, 1, [Support XSync extension])
|
AC_DEFINE(XSYNC, 1, [Support XSync extension])
|
||||||
AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
|
AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
|
||||||
|
|
|
@ -84,7 +84,6 @@
|
||||||
#undef XFreeXDGA
|
#undef XFreeXDGA
|
||||||
#undef XF86DRI
|
#undef XF86DRI
|
||||||
#undef TOGCUP
|
#undef TOGCUP
|
||||||
#undef MITMISC
|
|
||||||
#undef SCREENSAVER
|
#undef SCREENSAVER
|
||||||
#undef RANDR
|
#undef RANDR
|
||||||
#undef XFIXES
|
#undef XFIXES
|
||||||
|
|
|
@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = {
|
||||||
NULL
|
NULL
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
{
|
|
||||||
MITMiscExtensionInit,
|
|
||||||
MITMISCNAME,
|
|
||||||
&noMITMiscExtension,
|
|
||||||
NULL,
|
|
||||||
NULL
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
#ifdef notyet
|
#ifdef notyet
|
||||||
{
|
{
|
||||||
XTestExtensionInit,
|
XTestExtensionInit,
|
||||||
|
|
|
@ -18,12 +18,6 @@ extern void MultibufferExtensionInit(INITARGS);
|
||||||
#include <X11/extensions/multibufst.h>
|
#include <X11/extensions/multibufst.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MITMISC
|
|
||||||
extern void MITMiscExtensionInit(INITARGS);
|
|
||||||
#define _MITMISC_SERVER_
|
|
||||||
#include <X11/extensions/mitmiscstr.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef XTEST
|
#ifdef XTEST
|
||||||
extern void XTestExtensionInit(INITARGS);
|
extern void XTestExtensionInit(INITARGS);
|
||||||
#define _XTEST_SERVER_
|
#define _XTEST_SERVER_
|
||||||
|
|
|
@ -370,9 +370,6 @@ _X_HIDDEN void *dixLookupTab[] = {
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
SYMVAR(noMITShmExtension)
|
SYMVAR(noMITShmExtension)
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
SYMVAR(noMITMiscExtension)
|
|
||||||
#endif
|
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
SYMVAR(noMultibufferExtension)
|
SYMVAR(noMultibufferExtension)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -258,9 +258,6 @@
|
||||||
/* Support os-specific local connections */
|
/* Support os-specific local connections */
|
||||||
#undef LOCALCONN
|
#undef LOCALCONN
|
||||||
|
|
||||||
/* Support MIT Misc extension */
|
|
||||||
#undef MITMISC
|
|
||||||
|
|
||||||
/* Support MIT-SHM Extension */
|
/* Support MIT-SHM Extension */
|
||||||
#undef MITSHM
|
#undef MITSHM
|
||||||
|
|
||||||
|
|
|
@ -82,10 +82,6 @@ extern Bool noScreenSaverExtension;
|
||||||
extern Bool noMITShmExtension;
|
extern Bool noMITShmExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MITMISC
|
|
||||||
extern Bool noMITMiscExtension;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
extern Bool noMultibufferExtension;
|
extern Bool noMultibufferExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,9 +46,6 @@
|
||||||
/* Support IPv6 for TCP connections */
|
/* Support IPv6 for TCP connections */
|
||||||
#undef IPv6
|
#undef IPv6
|
||||||
|
|
||||||
/* Support MIT Misc extension */
|
|
||||||
#undef MITMISC
|
|
||||||
|
|
||||||
/* Support MIT-SHM Extension */
|
/* Support MIT-SHM Extension */
|
||||||
#undef MITSHM
|
#undef MITSHM
|
||||||
|
|
||||||
|
|
|
@ -142,9 +142,6 @@ extern Bool noScreenSaverExtension;
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
extern Bool noMITShmExtension;
|
extern Bool noMITShmExtension;
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
extern Bool noMITMiscExtension;
|
|
||||||
#endif
|
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
extern Bool noMultibufferExtension;
|
extern Bool noMultibufferExtension;
|
||||||
#endif
|
#endif
|
||||||
|
@ -276,9 +273,6 @@ extern void XTestExtensionInit(INITARGS);
|
||||||
#ifdef BIGREQS
|
#ifdef BIGREQS
|
||||||
extern void BigReqExtensionInit(INITARGS);
|
extern void BigReqExtensionInit(INITARGS);
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
extern void MITMiscExtensionInit(INITARGS);
|
|
||||||
#endif
|
|
||||||
#ifdef XIDLE
|
#ifdef XIDLE
|
||||||
extern void XIdleExtensionInit(INITARGS);
|
extern void XIdleExtensionInit(INITARGS);
|
||||||
#endif
|
#endif
|
||||||
|
@ -409,9 +403,6 @@ static ExtensionToggle ExtensionToggleList[] =
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
{ SHMNAME, &noMITShmExtension },
|
{ SHMNAME, &noMITShmExtension },
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
{ "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension },
|
|
||||||
#endif
|
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
{ "Multi-Buffering", &noMultibufferExtension },
|
{ "Multi-Buffering", &noMultibufferExtension },
|
||||||
#endif
|
#endif
|
||||||
|
@ -538,9 +529,6 @@ InitExtensions(argc, argv)
|
||||||
#ifdef BIGREQS
|
#ifdef BIGREQS
|
||||||
if (!noBigReqExtension) BigReqExtensionInit();
|
if (!noBigReqExtension) BigReqExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
if (!noMITMiscExtension) MITMiscExtensionInit();
|
|
||||||
#endif
|
|
||||||
#ifdef XIDLE
|
#ifdef XIDLE
|
||||||
if (!noXIdleExtension) XIdleExtensionInit();
|
if (!noXIdleExtension) XIdleExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -162,9 +162,6 @@ _X_EXPORT Bool noScreenSaverExtension = FALSE;
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
_X_EXPORT Bool noMITShmExtension = FALSE;
|
_X_EXPORT Bool noMITShmExtension = FALSE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
|
||||||
_X_EXPORT Bool noMITMiscExtension = FALSE;
|
|
||||||
#endif
|
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
_X_EXPORT Bool noMultibufferExtension = FALSE;
|
_X_EXPORT Bool noMultibufferExtension = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user