Changeset Navigation

Changeset 1283

Timestamp:

08/26/06 13:47:12

Author:

fumanchu

Message:

Fixes for #479 (CherryPy crashes on using seteuid / setegid) for CP 2.2 and CP 3.

Files:

r1238	r1283
386	386	return
387	387	except socket.error, x:
388		if x.args[1] == "Bad file descriptor":
	388	msg = x.args[1]
	389	if msg == "Bad file descriptor":
389	390	# Our socket was closed
	391	return
	392	if msg == "Resource temporarily unavailable":
	393	# Just try again. See http://www.cherrypy.org/ticket/479.
390	394	return
391	395	raise

r1279	r1283
558	558	return
559	559	except socket.error, x:
560		if x.args[1] in ("Bad file descriptor",
561		"Socket operation on non-socket"):
562		# Our socket was closed
	560	msg = x.args[1]
	561	if msg in ("Bad file descriptor", "Socket operation on non-socket"):
	562	# Our socket was closed.
	563	return
	564	if msg == "Resource temporarily unavailable":
	565	# Just try again. See http://www.cherrypy.org/ticket/479.
563	566	return
564	567	raise