Skip to content

Commit c548bd8

Browse files
romainneutronromainneutron
committed
bug #11436 fix signal handling in wait() on calls to stop() (xabbuh, romainneutron)
This PR was merged into the 2.3 branch. Discussion ---------- fix signal handling in wait() on calls to stop() | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11286 | License | MIT | Doc PR | ``wait()`` throws an exception when the process was terminated by a signal. This should not happen when the termination was requested by calling the ``stop()`` method (for example, inside a callback which is passed to ``wait()``). Commits ------- 5939d34 [Process] Fix unit tests in sigchild environment eb68662 [Process] fix signal handling in wait() 94ffc4f bug #11469 [BrowserKit] Fixed server HTTP_HOST port uri conversion (bcremer, fabpot) 103fd88 [BrowserKit] refactor code and fix unquoted regex f401ab9 Fixed server HTTP_HOST port uri conversion 045cbc5 bug #11425 Fix issue described in #11421 (Ben, ben-rosio) f5bfa9b bug #11423 Pass a Scope instance instead of a scope name when cloning a container in the GrahpvizDumper (jakzal) 3177be5 minor #11464 [Translator] Use quote to surround invalid locale (lyrixx) c9742ef [Translator] Use quote to surround invalid locale 4dbe0e1 bug #11120 [2.3][Process] Reduce I/O load on Windows platform (romainneutron) 797d814 bug #11342 [2.3][Form] Check if IntlDateFormatter constructor returned a valid object before using it (romainneutron) 0b5348e minor #11441 [Translator] Optimize assertLocale regexp (Jérémy Derussé) 537c39b Optimize assertLocale regexp 4cf50e8 Bring code into standard 9f4313c [Process] Add test to verify fix for issue #11421 02eb765 [Process] Fixes issue #11421 6787669 [DependencyInjection] Pass a Scope instance instead of a scope name. 9572918 bug #11411 [Validator] Backported #11410 to 2.3: Object initializers are called only once per object (webmozart) 291cbf9 [Validator] Backported #11410 to 2.3: Object initializers are called only once per object efab884 bug #11403 [Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator (takeit) 3176f8b [Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator 91e32f8 bug #11381 [2.3] [Process] Use correct test for empty string in UnixPipes (whs, romainneutron) 45df2f3 minor #11397 [2.3][Process] Fix unit tests on Windows platform (romainneutron) cec0a45 [Process] Adjust PR #11264, make it Windows compatible and fix CS d418935 [Process] Fix unit tests on Windows platform ff0bb01 [Process] Reduce I/O load on Windows platform ace5a29 bumped Symfony version to 2.3.19 75e07e6 updated VERSION for 2.3.18 4a12f4d update CONTRIBUTORS for 2.3.18 98b891d updated CHANGELOG for 2.3.18 06a80fb Validate locales sets intos translator 06fc97e feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore) 3c54659 minor #11387 [2.3] [Validator] Fix UserPassword validator translation (redstar504) 73d50ed Fix UserPassword validator translation 93a970c bug #11386 Remove Spaceless Blocks from Twig Form Templates (chrisguitarguy) 8f9ed3e Remove Spaceless Blocks from Twig Form Templates 9e1ea4a [Process] Use correct test for empty string in UnixPipes 6af3d05 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671) ebf967d [Form] Check if IntlDateFormatter constructor returned a valid object before using it
2 parents ea45769 + 5939d34 commit c548bd8

File tree

32 files changed

+744
-327
lines changed

32 files changed

+744
-327
lines changed

‎CHANGELOG-2.3.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.18 (2014-07-15)
11+
12+
* [Security] Forced validate of locales passed to the translator
13+
* feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore)
14+
* bug #11386 Remove Spaceless Blocks from Twig Form Templates (chrisguitarguy)
15+
* bug #9719 [TwigBundle] fix configuration tree for paths (mdavis1982, cordoval)
16+
* bug #11244 [HttpFoundation] Remove body-related headers when sending the response, if body is empty (SimonSimCity)
17+
1018
* 2.3.17 (2014-07-07)
1119

1220
* bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)

‎CONTRIBUTORS.md

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Symfony2 is the result of the work of many people who made the code better
1919
- Ryan Weaver (weaverryan)
2020
- Lukas Kahwe Smith (lsmith)
2121
- Jeremy Mikola (jmikola)
22-
- Jean-François Simon (jfsimon)
2322
- Romain Neutron (romain)
23+
- Jean-François Simon (jfsimon)
2424
- Benjamin Eberlei (beberlei)
2525
- Igor Wiedler (igorw)
2626
- Hugo Hamon (hhamon)
@@ -44,18 +44,18 @@ Symfony2 is the result of the work of many people who made the code better
4444
- Wouter De Jong (wouterj)
4545
- Eric Clemmons (ericclemmons)
4646
- Nicolas Grekas (nicolas-grekas)
47+
- Andrej Hudec (pulzarraider)
4748
- Deni
4849
- Henrik Westphal (snc)
4950
- Dariusz Górecki (canni)
50-
- Andrej Hudec (pulzarraider)
5151
- Arnout Boks (aboks)
52+
- Christian Raue
5253
- Michel Weimerskirch (mweimerskirch)
5354
- Lee McDermott
5455
- Brandon Turner
5556
- Douglas Greenshields (shieldo)
5657
- Daniel Holmes (dholmes)
5758
- Jordan Alliot (jalliot)
58-
- Christian Raue
5959
- John Wards (johnwards)
6060
- Fran Moreno (franmomu)
6161
- Bart van den Burg (burgov)
@@ -75,21 +75,21 @@ Symfony2 is the result of the work of many people who made the code better
7575
- Fabien Pennequin (fabienpennequin)
7676
- Jacob Dreesen (jdreesen)
7777
- Gábor Egyed (1ed)
78+
- Ait Boudad Abdellatif (aitboudad)
7879
- Adrien Brault (adrienbrault)
7980
- Michal Piotrowski (eventhorizon)
80-
- Ait Boudad Abdellatif (aitboudad)
8181
- Robert Schönthal (digitalkaoz)
8282
- Juti Noppornpitak (shiroyuki)
8383
- Sebastian Hörl (blogsh)
8484
- Daniel Gomes (danielcsgomes)
8585
- Hidenori Goto (hidenorigoto)
8686
- Peter Kokot (maastermedia)
87+
- Christian Flothmann (xabbuh)
8788
- Jérémie Augustin (jaugustin)
8889
- David Buchmann (dbu)
8990
- Jérôme Tamarelle (gromnan)
9091
- Tigran Azatyan (tigranazatyan)
9192
- Javier Eguiluz (javier.eguiluz)
92-
- Christian Flothmann (xabbuh)
9393
- Rafael Dohms (rdohms)
9494
- Richard Shank (iampersistent)
9595
- Gordon Franke (gimler)
@@ -146,6 +146,7 @@ Symfony2 is the result of the work of many people who made the code better
146146
- Manuel Reinhard (sprain)
147147
- Danny Berger (dpb587)
148148
- Xavier Montaña Carreras (xmontana)
149+
- Michele Orselli (orso)
149150
- Xavier Perez
150151
- Arjen Brouwer (arjenjb)
151152
- Katsuhiro OGAWA
@@ -168,7 +169,6 @@ Symfony2 is the result of the work of many people who made the code better
168169
- Robert Kiss (kepten)
169170
- Kim Hemsø Rasmussen (kimhemsoe)
170171
- Wouter Van Hecke
171-
- Michele Orselli (orso)
172172
- Michael Holm (hollo)
173173
- Marc Weistroff (futurecat)
174174
- Pierre-Yves LEBECQ (pylebecq)
@@ -231,6 +231,7 @@ Symfony2 is the result of the work of many people who made the code better
231231
- Ismael Ambrosi (iambrosi)
232232
- Shein Alexey
233233
- Issei Murasawa (issei_m)
234+
- hacfi (hifi)
234235
- Joe Lencioni
235236
- Kai
236237
- Xavier HAUSHERR
@@ -274,6 +275,7 @@ Symfony2 is the result of the work of many people who made the code better
274275
- François-Xavier de Guillebon (de-gui_f)
275276
- boombatower
276277
- Fabrice Bernhard (fabriceb)
278+
- Clément Gautier (clementgautier)
277279
- Fabian Lange (codingfabian)
278280
- Yoshio HANAWA
279281
- Baptiste Clavié (talus)
@@ -294,11 +296,11 @@ Symfony2 is the result of the work of many people who made the code better
294296
- Maks Slesarenko
295297
- Markus Lanthaler (lanthaler)
296298
- Vicent Soria Durá (vicentgodella)
299+
- Chris Wilkinson (thewilkybarkid)
297300
- Ioan Negulescu
298301
- Andrew Udvare (audvare)
299302
- alexpods
300303
- Erik Trapman (eriktrapman)
301-
- hacfi (hifi)
302304
- De Cock Xavier (xdecock)
303305
- Alex Pott
304306
- Norbert Orzechowicz (norzechowicz)
@@ -365,13 +367,15 @@ Symfony2 is the result of the work of many people who made the code better
365367
- Arturs Vonda
366368
- Sascha Grossenbacher
367369
- Ben Davies (bendavies)
370+
- Simon Schick (simonsimcity)
368371
- Hossein Bukhamsin
369372
- Paweł Wacławczyk (pwc)
370373
- Oleg Zinchenko (cystbear)
371374
- Diego Saint Esteben (dii3g0)
372375
- Johannes Klauss (cloppy)
373376
- Evan Villemez
374377
- fzerorubigd
378+
- Benjamin Grandfond (benjamin)
375379
- Tiago Brito (blackmx)
376380
- Richard van den Brand (ricbra)
377381
- develop
@@ -403,7 +407,6 @@ Symfony2 is the result of the work of many people who made the code better
403407
- Marek Štípek (maryo)
404408
- John Bohn (jbohn)
405409
- Jakub Škvára (jskvara)
406-
- Chris Wilkinson (thewilkybarkid)
407410
- Andrew Hilobok (hilobok)
408411
- Christian Soronellas (theunic)
409412
- Jérôme Vieilledent (lolautruche)
@@ -532,7 +535,6 @@ Symfony2 is the result of the work of many people who made the code better
532535
- jfcixmedia
533536
- Martijn Evers
534537
- Benjamin Paap (benjaminpaap)
535-
- Simon Schick (simonsimcity)
536538
- Christian
537539
- Sergii Smertin (nfx)
538540
- Eddie Jaoude
@@ -550,6 +552,7 @@ Symfony2 is the result of the work of many people who made the code better
550552
- Benoit Garret
551553
- DerManoMann
552554
- Asmir Mustafic (goetas)
555+
- Julien Bianchi (jubianchi)
553556
- Marcin Chwedziak
554557
- Roland Franssen (ro0)
555558
- Maciej Malarz
@@ -562,20 +565,22 @@ Symfony2 is the result of the work of many people who made the code better
562565
- kaiwa
563566
- Albert Ganiev (helios-ag)
564567
- Neil Katin
568+
- David Otton
565569
- peter
566570
- Artem Kolesnikov (tyomo4ka)
567571
- Gustavo Adrian
568-
- Clément Gautier (clementgautier)
569572
- Yannick
570573
- Luc Vieillescazes (iamluc)
571574
- Eduardo García Sanz (coma)
572575
- David de Boer (ddeboer)
573576
- Brooks Boyd
574577
- Roger Webb
578+
- Dmitriy Simushev
575579
- Max Voloshin (maxvoloshin)
576580
- Nicolas Fabre (nfabre)
577581
- Raul Rodriguez (raul782)
578582
- Patrick Landolt (scube)
583+
- WybrenKoelmans
579584
- Derek Lambert
580585
- Felicitus
581586
- Krzysztof Przybyszewski
@@ -730,6 +735,7 @@ Symfony2 is the result of the work of many people who made the code better
730735
- catch
731736
- Alexandre Segura
732737
- Josef Cech
738+
- Nate (frickenate)
733739
- Matthew Foster (mfoster)
734740
- Maximilian Reichel (phramz)
735741
- Paul Seiffert (seiffert)
@@ -750,7 +756,6 @@ Symfony2 is the result of the work of many people who made the code better
750756
- Andrey Ryaguzov
751757
- Gunther Konig
752758
- František Bereň
753-
- Benjamin Grandfond (benjamin)
754759
- Christoph Nissle (derstoffel)
755760
- Ionel Scutelnicu (ionelscutelnicu)
756761
- Johnny Peck (johnnypeck)
@@ -875,6 +880,7 @@ Symfony2 is the result of the work of many people who made the code better
875880
- Yorkie Chadwick (yorkie76)
876881
- Yanick Witschi
877882
- Ondrej Mirtes
883+
- akimsko
878884
- Youpie
879885
- srsbiz
880886
- Nicolas A. Bérard-Nault
@@ -1010,6 +1016,7 @@ Symfony2 is the result of the work of many people who made the code better
10101016
- Adam Monsen (meonkeys)
10111017
- ollie harridge (ollietb)
10121018
- Paweł Szczepanek (pauluz)
1019+
- Christian López Espínola (penyaskito)
10131020
- Petr Jaroš (petajaros)
10141021
- Philipp Hoffmann (philipphoffmann)
10151022
- Alex Carol (picard89)

0 commit comments

Comments
 (0)