From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 3 Jun 2012 21:20:26 +0000 (-0300)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.5RC1~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60c5f9910fbc5bd21fca8a624c6486ad8a41273a;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Optimize comparison between same HashTable pointer
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings
---

60c5f9910fbc5bd21fca8a624c6486ad8a41273a