Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle

ext/fileinfo/libmagic/apprentice.c

@@ -2611,8 +2611,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
 
 	if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) {
 		file_oomem(ms, sizeof(*map));
-		efree(map);
-		goto error;
+		return NULL;
 	}
 
 	if (fn == NULL) {

ext/opcache/Optimizer/block_pass.c

@@ -381,7 +381,7 @@ static inline void del_source(zend_code_block *from, zend_code_block *to)
 		return;
 	}
 
-	if (to->sources->next == NULL) {
+	if (!to->protected && to->sources->next == NULL) {
 		/* source to only one block */
 		zend_code_block *from_block = to->sources->from;