]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 403974f aed225b)
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Sat, 5 Sep 2015 12:43:19 +0000 (14:43 +0200)
committerChristoph M. Becker <cmb@php.net>
Sat, 5 Sep 2015 12:43:19 +0000 (14:43 +0200)
commitcc9da62bdb815421151958e8f2971d992291192a
treed77c1040bed9c3e2bcbd609e245f6c02fd513417tree | snapshot
parent403974f4dc762cf0c5f1ac09009fff13543e099ccommit | diff
parentaed225b7e4d711d7c2cbf45f59e5f66929debb94commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
sapi/cli/php_cli_server.c
sapi/cli/php_cli_server.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.