From feac3980ced0d80dc21982d87658876644c60e72 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@krypto.org>
Date: Wed, 27 Aug 2014 09:34:38 -0700
Subject: [PATCH] The webbrowser module now uses subprocess's
 start_new_session=True rather than a potentially risky preexec_fn=os.setsid
 call.

---
 Lib/webbrowser.py | 15 ++++-----------
 Misc/NEWS         |  3 +++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 9e47084a91b..845f1d004c0 100755
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -159,10 +159,8 @@ class BackgroundBrowser(GenericBrowser):
             if sys.platform[:3] == 'win':
                 p = subprocess.Popen(cmdline)
             else:
-                setsid = getattr(os, 'setsid', None)
-                if not setsid:
-                    setsid = getattr(os, 'setpgrp', None)
-                p = subprocess.Popen(cmdline, close_fds=True, preexec_fn=setsid)
+                p = subprocess.Popen(cmdline, close_fds=True,
+                                     start_new_session=True)
             return (p.poll() is None)
         except OSError:
             return False
@@ -321,11 +319,6 @@ class Konqueror(BaseBrowser):
             action = "openURL"
 
         devnull = subprocess.DEVNULL
-        # if possible, put browser in separate process group, so
-        # keyboard interrupts don't affect browser as well as Python
-        setsid = getattr(os, 'setsid', None)
-        if not setsid:
-            setsid = getattr(os, 'setpgrp', None)
 
         try:
             p = subprocess.Popen(["kfmclient", action, url],
@@ -343,7 +336,7 @@ class Konqueror(BaseBrowser):
             p = subprocess.Popen(["konqueror", "--silent", url],
                                  close_fds=True, stdin=devnull,
                                  stdout=devnull, stderr=devnull,
-                                 preexec_fn=setsid)
+                                 start_new_session=True)
         except OSError:
             # fall through to next variant
             pass
@@ -356,7 +349,7 @@ class Konqueror(BaseBrowser):
             p = subprocess.Popen(["kfm", "-d", url],
                                  close_fds=True, stdin=devnull,
                                  stdout=devnull, stderr=devnull,
-                                 preexec_fn=setsid)
+                                 start_new_session=True)
         except OSError:
             return False
         else:
diff --git a/Misc/NEWS b/Misc/NEWS
index 7028cf161de..bc9086123fd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- The webbrowser module now uses subprocess's start_new_session=True rather
+  than a potentially risky preexec_fn=os.setsid call.
+
 - Issue #22236: Fixed Tkinter images copying operations in NoDefaultRoot mode.
 
 - Issue #22191: Fix warnings.__all__.