Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixes #67960 - Long/short day names reversed in jddayofweek()

Conflicts:
	ext/calendar/calendar.c

diff --cc ext/calendar/calendar.c
index 0f94b08bca5ffda31404e1aa40c894253078ac9f,7ef03f060f2e519748cc0bb7429e87d2fd346a66..78834effa962f33e65de84056df8f62aa847b728
--- 1/ext/calendar/calendar.c
--- 2/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@@ -694,11 -696,11 +694,11 @@@ PHP_FUNCTION(jddayofweek
        daynames = DayNameShort[day];
  
        switch (mode) {
-       case CAL_DOW_SHORT:
+       case CAL_DOW_LONG:
 -              RETURN_STRING(daynamel, 1);
 +              RETURN_STRING(daynamel);
                break;
-       case CAL_DOW_LONG:
+       case CAL_DOW_SHORT:
 -              RETURN_STRING(daynames, 1);
 +              RETURN_STRING(daynames);
                break;
        case CAL_DOW_DAYNO:
        default: